Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
merging with origin develop Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5870ed4f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5870ed4f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5870ed4f Branch: refs/heads/develop Commit: 5870ed4ff055dba7a41b89b073bb5b9c3abbc6ce Parents: 9bf53d2 0d9a612 Author: scnakandala <[email protected]> Authored: Fri Dec 4 01:49:53 2015 -0500 Committer: scnakandala <[email protected]> Committed: Fri Dec 4 01:49:53 2015 -0500 ---------------------------------------------------------------------- .../src/main/resources/lib/airavata/Airavata.h | 48 +- .../lib/airavata/experiment_model_types.cpp | 4 +- .../lib/airavata/experiment_model_types.h | 4 +- .../lib/airavata/process_model_types.cpp | 48 +- .../lib/airavata/process_model_types.h | 24 +- .../lib/Airavata/Model/Process/Types.php | 46 ++ .../lib/apache/airavata/model/process/ttypes.py | 28 +- .../client/samples/CreateLaunchExperiment.java | 14 +- .../airavata/model/process/ProcessModel.java | 215 +++++++- .../model/util/ExperimentModelUtil.java | 2 + .../apache/airavata/common/utils/Constants.java | 3 + .../store/server/CredentialStoreServer.java | 35 +- .../client/CredentialStoreClientFactory.java | 17 +- .../airavata/gfac/bes/utils/SecurityUtils.java | 54 +- modules/gfac/gfac-impl/pom.xml | 35 +- .../gfac/impl/task/BESJobSubmissionTask.java | 194 +++++++ .../gfac/impl/task/utils/bes/ActivityInfo.java | 50 ++ .../task/utils/bes/ApplicationProcessor.java | 221 ++++++++ .../gfac/impl/task/utils/bes/BESConstants.java | 45 ++ .../impl/task/utils/bes/DataTransferrer.java | 150 ++++++ .../impl/task/utils/bes/FileDownloader.java | 255 +++++++++ .../impl/task/utils/bes/FileTransferBase.java | 223 ++++++++ .../gfac/impl/task/utils/bes/FileUploader.java | 242 +++++++++ .../gfac/impl/task/utils/bes/JSDLGenerator.java | 115 +++++ .../gfac/impl/task/utils/bes/JSDLUtils.java | 517 +++++++++++++++++++ .../airavata/gfac/impl/task/utils/bes/Mode.java | 45 ++ .../gfac/impl/task/utils/bes/MyProxyLogon.java | 465 +++++++++++++++++ .../gfac/impl/task/utils/bes/OSType.java | 124 +++++ .../task/utils/bes/ProcessorRequirement.java | 61 +++ .../impl/task/utils/bes/RangeValueType.java | 271 ++++++++++ .../impl/task/utils/bes/ResourceProcessor.java | 97 ++++ .../task/utils/bes/ResourceRequirement.java | 34 ++ .../impl/task/utils/bes/SPMDVariations.java | 52 ++ .../gfac/impl/task/utils/bes/SecurityUtils.java | 167 ++++++ .../impl/task/utils/bes/StorageCreator.java | 207 ++++++++ .../task/utils/bes/UASDataStagingProcessor.java | 182 +++++++ .../task/utils/bes/UNICORESecurityContext.java | 191 +++++++ .../gfac/impl/task/utils/bes/URIUtils.java | 121 +++++ .../task/utils/bes/X509SecurityContext.java | 339 ++++++++++++ .../catalog/impl/ExperimentRegistry.java | 6 + .../core/experiment/catalog/model/Process.java | 20 + .../catalog/resources/ProcessResource.java | 20 + .../experiment/catalog/resources/Utils.java | 2 + .../utils/ThriftDataModelConversion.java | 2 + .../src/main/resources/expcatalog-derby.sql | 2 + .../src/main/resources/expcatalog-mysql.sql | 2 + .../airavata-api/process_model.thrift | 4 +- 47 files changed, 4896 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5870ed4f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h ----------------------------------------------------------------------
