airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [13/14] airavata git commit: Merge remote-tracking branch 'origin/master'
Date Wed, 09 Dec 2015 05:09:06 GMT
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
#	airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
#	airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
#	airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
#	airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
#	modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
#	modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java
#	modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java
#	modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java
#	modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java
#	modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/72dee689
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/72dee689
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/72dee689

Branch: refs/heads/master
Commit: 72dee689b08625817b2f518abbaff0f3232a7e4e
Parents: 6a9a125 17d1b4f
Author: smarru <smarru@apache.org>
Authored: Wed Dec 9 00:03:39 2015 -0500
Committer: smarru <smarru@apache.org>
Committed: Wed Dec 9 00:03:39 2015 -0500

----------------------------------------------------------------------
 .gitignore                                      |    2 +
 .../server/handler/AiravataServerHandler.java   |  274 ++-
 .../api/server/util/AppCatalogInitUtil.java     |    1 -
 .../api/server/util/RegistryInitUtil.java       |    4 +-
 .../api/server/handler/utils/ExpCatInit.java    |    1 +
 .../src/main/resources/lib/airavata/Airavata.h  | 2077 ++++++++++++++----
 .../lib/airavata/Airavata_server.skeleton.cpp   |  187 +-
 .../resources/lib/airavata/airavata_api_types.h |    2 +
 .../lib/airavata/airavata_data_models_types.h   |    2 +
 .../airavata/compute_resource_model_types.cpp   | 1288 +++--------
 .../lib/airavata/compute_resource_model_types.h |  311 +--
 .../airavata/data_movement_models_constants.cpp |   34 +
 .../airavata/data_movement_models_constants.h   |   41 +
 .../lib/airavata/data_movement_models_types.cpp |  763 +++++++
 .../lib/airavata/data_movement_models_types.h   |  327 +++
 .../airavata/data_resource_models_constants.cpp |   34 +
 .../airavata/data_resource_models_constants.h   |   41 +
 .../lib/airavata/data_resource_models_types.cpp |  501 +++++
 .../lib/airavata/data_resource_models_types.h   |  231 ++
 .../lib/airavata/experiment_model_types.cpp     |  406 ++--
 .../lib/airavata/experiment_model_types.h       |   31 +-
 .../gateway_resource_profile_model_types.cpp    |  123 +-
 .../gateway_resource_profile_model_types.h      |   66 +-
 .../lib/airavata/process_model_types.cpp        |   70 +-
 .../lib/airavata/process_model_types.h          |   32 +-
 .../storage_resource_model_constants.cpp        |   34 +
 .../airavata/storage_resource_model_constants.h |   41 +
 .../airavata/storage_resource_model_types.cpp   |  235 ++
 .../lib/airavata/storage_resource_model_types.h |  116 +
 .../resources/lib/airavata/task_model_types.cpp |  214 +-
 .../resources/lib/airavata/task_model_types.h   |   25 +-
 .../resources/lib/Airavata/API/Error/Types.php  |    2 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |  943 +-------
 .../Model/AppCatalog/GatewayProfile/Types.php   |   85 +-
 .../Model/AppCatalog/StorageResource/Types.php  |  232 ++
 .../lib/Airavata/Model/Data/Movement/Types.php  |  742 +++++++
 .../lib/Airavata/Model/Data/Resource/Types.php  |  472 ++++
 .../lib/Airavata/Model/Experiment/Types.php     |  210 +-
 .../lib/Airavata/Model/Process/Types.php        |   69 +
 .../resources/lib/Airavata/Model/Task/Types.php |   53 +
 .../src/main/resources/lib/Types.php            |   20 +
 .../lib/apache/airavata/api/Airavata-remote     |  114 +-
 .../lib/apache/airavata/api/error/ttypes.py     |    2 +-
 .../resources/lib/apache/airavata/api/ttypes.py |    2 +
 .../model/appcatalog/computeresource/ttypes.py  |  700 +-----
 .../model/appcatalog/gatewayprofile/ttypes.py   |   78 +-
 .../appcatalog/storageresource/__init__.py      |    1 +
 .../appcatalog/storageresource/constants.py     |   11 +
 .../model/appcatalog/storageresource/ttypes.py  |  167 ++
 .../lib/apache/airavata/model/data/__init__.py  |    0
 .../airavata/model/data/movement/__init__.py    |    1 +
 .../airavata/model/data/movement/constants.py   |   11 +
 .../airavata/model/data/movement/ttypes.py      |  625 ++++++
 .../airavata/model/data/resource/__init__.py    |    1 +
 .../airavata/model/data/resource/constants.py   |   11 +
 .../airavata/model/data/resource/ttypes.py      |  312 +++
 .../apache/airavata/model/experiment/ttypes.py  |  140 +-
 .../lib/apache/airavata/model/process/ttypes.py |   41 +-
 .../lib/apache/airavata/model/task/ttypes.py    |   29 +-
 .../lib/apache/airavata/model/ttypes.py         |    2 +
 .../client/samples/CreateLaunchBES.java         |    3 +-
 .../client/samples/CreateLaunchExperiment.java  |   15 +-
 .../client/samples/RegisterSampleData.java      |    4 +-
 .../tools/RegisterOGCEUS3Application.java       |    7 +-
 .../tools/RegisterSampleApplications.java       |    6 +-
 .../tools/RegisterSampleApplicationsUtils.java  |    2 +
 .../client/tools/RegisterUS3Application.java    |    7 +-
 .../computeresource/DataMovementInterface.java  |  630 ------
 .../computeresource/DataMovementProtocol.java   |   87 -
 .../computeresource/GridFTPDataMovement.java    |  681 ------
 .../computeresource/LOCALDataMovement.java      |  418 ----
 .../computeresource/SCPDataMovement.java        |  746 -------
 .../computeresource/SecurityProtocol.java       |   88 -
 .../computeresource/UnicoreDataMovement.java    |  629 ------
 .../gatewayprofile/DataStoragePreference.java   |  728 ------
 .../gatewayprofile/StoragePreference.java       |  728 ++++++
 .../StorageResourceDescription.java             |  900 ++++++++
 .../airavata/model/data/movement/DMType.java    |   62 +
 .../data/movement/DataMovementInterface.java    |  630 ++++++
 .../data/movement/DataMovementProtocol.java     |   87 +
 .../data/movement/GridFTPDataMovement.java      |  681 ++++++
 .../model/data/movement/LOCALDataMovement.java  |  418 ++++
 .../model/data/movement/SCPDataMovement.java    |  746 +++++++
 .../model/data/movement/SecurityProtocol.java   |   88 +
 .../data/movement/UnicoreDataMovement.java      |  629 ++++++
 .../data/resource/DataReplicaLocationModel.java | 1085 +++++++++
 .../model/data/resource/DataResourceModel.java  | 1029 +++++++++
 .../apache/airavata/model/task/TaskTypes.java   |    5 +-
 .../model/util/ExperimentModelUtil.java         |    3 +
 .../apache/airavata/common/utils/Constants.java |    3 +
 .../main/resources/airavata-server.properties   |   21 +-
 .../store/server/CredentialStoreServer.java     |   35 +-
 .../test/resources/airavata-server.properties   |   21 +-
 .../client/CredentialStoreClientFactory.java    |   17 +-
 .../credentialStoreDataModel.thrift             |    2 +-
 modules/data-manager/pom.xml                    |   61 +
 .../airavata/data/manager/DataManager.java      |  121 +
 .../data/manager/DataManagerConstants.java      |   33 +
 .../data/manager/DataManagerException.java      |   35 +
 .../data/manager/DataManagerFactory.java        |   32 +
 .../airavata/data/manager/DataManagerImpl.java  |  260 +++
 .../data/manager/utils/DataTransferUtils.java   |  142 ++
 .../data/manager/utils/ssh/SSHApiException.java |   35 +
 .../utils/ssh/SSHAuthenticationUtils.java       |   45 +
 .../manager/utils/ssh/SSHCommandOutput.java     |   55 +
 .../manager/utils/ssh/SSHKeyAuthentication.java |   83 +
 .../manager/utils/ssh/SSHStandardOutReader.java |   86 +
 .../data/manager/utils/ssh/SSHUserInfo.java     |   70 +
 .../data/manager/utils/ssh/SSHUtils.java        |  500 +++++
 .../data/manager/DataManagerFactoryTest.java    |   42 +
 .../data/manager/DataManagerImplTest.java       |  277 +++
 .../airavata/data/manager/utils/AppCatInit.java |  320 +++
 .../data/manager/utils/DataCatInit.java         |  315 +++
 modules/data-manager/src/test/resources/id_rsa  |   30 +
 .../data-manager/src/test/resources/id_rsa.pub  |    1 +
 .../data-manager/src/test/resources/known_hosts |    0
 .../airavata/gfac/bes/utils/SecurityUtils.java  |   54 +-
 .../apache/airavata/gfac/core/GFacUtils.java    |    6 +-
 .../core/config/DataTransferTaskConfig.java     |    2 +-
 .../gfac/core/config/GFacYamlConfigruation.java |    2 +-
 .../gfac/core/context/ProcessContext.java       |   52 +-
 .../airavata/gfac/core/monitor/JobMonitor.java  |    6 +
 modules/gfac/gfac-impl/pom.xml                  |   35 +-
 .../org/apache/airavata/gfac/impl/Factory.java  |   30 +-
 .../airavata/gfac/impl/GFacEngineImpl.java      |  115 +-
 .../apache/airavata/gfac/impl/GFacWorker.java   |   54 +-
 .../gfac/impl/task/BESJobSubmissionTask.java    |  194 ++
 .../airavata/gfac/impl/task/DataStageTask.java  |    4 +-
 .../impl/task/DefaultJobSubmissionTask.java     |   25 +-
 .../gfac/impl/task/EnvironmentSetupTask.java    |    2 +-
 .../gfac/impl/task/ForkJobSubmissionTask.java   |    2 +-
 .../gfac/impl/task/SCPDataStageTask.java        |   20 +-
 .../gfac/impl/task/utils/StreamData.java        |   18 +-
 .../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 +++
 .../impl/watcher/CancelRequestWatcherImpl.java  |   36 +-
 .../gfac/monitor/email/EmailBasedMonitor.java   |   42 +-
 .../integration/tools/DocumentCreatorNew.java   |    3 -
 .../integration/tools/DocumentCreatorUtils.java |    2 -
 .../core/utils/OrchestratorUtils.java           |   14 +-
 .../cpi/impl/SimpleOrchestratorImpl.java        |    1 +
 .../server/OrchestratorServerHandler.java       |   38 +-
 modules/registry/registry-core/pom.xml          |   53 +-
 .../core/app/catalog/impl/AppCatalogImpl.java   |    4 +
 .../app/catalog/impl/ComputeResourceImpl.java   |   29 +-
 .../catalog/impl/GwyResourceProfileImpl.java    |   46 +-
 .../app/catalog/impl/StorageResourceImpl.java   |  248 +++
 .../catalog/model/DataStoragePreference.java    |   96 -
 .../catalog/model/DataStoragePreferencePK.java  |   64 -
 .../app/catalog/model/DataStorageResource.java  |  113 +
 .../core/app/catalog/model/GatewayProfile.java  |   11 -
 .../app/catalog/model/StorageInterface.java     |  102 +
 .../app/catalog/model/StorageInterface_PK.java  |   62 +
 .../app/catalog/model/StoragePreference.java    |   95 +
 .../app/catalog/model/StoragePreferencePK.java  |   64 +
 .../core/app/catalog/model/StorageResource.java |  110 +
 .../resources/AppCatAbstractResource.java       |   29 +-
 .../DataStoragePreferenceResource.java          |  323 ---
 .../resources/GatewayProfileResource.java       |   11 -
 .../resources/StorageInterfaceResource.java     |  326 +++
 .../resources/StoragePreferenceResource.java    |  322 +++
 .../resources/StorageResourceResource.java      |  350 +++
 .../app/catalog/util/AppCatalogJPAUtils.java    |   49 +-
 .../catalog/util/AppCatalogResourceType.java    |    4 +-
 .../util/AppCatalogThriftConversion.java        |   56 +-
 .../core/data/catalog/impl/DataCatalogImpl.java |  265 +++
 .../core/data/catalog/model/Configuration.java  |   55 +
 .../data/catalog/model/DataReplicaLocation.java |  116 +
 .../core/data/catalog/model/DataResource.java   |  116 +
 .../catalog/utils/DataCatalogConstants.java     |   49 +
 .../data/catalog/utils/DataCatalogJPAUtils.java |   82 +
 .../utils/DataCatalogQueryGenerator.java        |  111 +
 .../utils/ThriftDataModelConversion.java        |  111 +
 .../experiment/catalog/ExpCatResourceUtils.java |   18 +-
 .../catalog/impl/ExperimentCatalogImpl.java     |    8 +-
 .../catalog/impl/ExperimentRegistry.java        |   10 +-
 .../catalog/impl/ProjectRegistry.java           |    4 +-
 .../catalog/impl/RegistryFactory.java           |   14 +
 .../experiment/catalog/model/Experiment.java    |   10 -
 .../experiment/catalog/model/GatewayWorker.java |   11 -
 .../core/experiment/catalog/model/Process.java  |   30 +
 .../catalog/model/UserConfigurationData.java    |   10 +
 .../core/experiment/catalog/model/UserPK.java   |   75 +
 .../core/experiment/catalog/model/Users.java    |  100 +-
 .../resources/AbstractExpCatResource.java       |    1 +
 .../catalog/resources/GatewayResource.java      |    5 +-
 .../catalog/resources/ProcessResource.java      |   30 +
 .../catalog/resources/ProjectResource.java      |   10 +-
 .../catalog/resources/ProjectUserResource.java  |    8 +-
 .../UserConfigurationDataResource.java          |   10 +
 .../catalog/resources/UserResource.java         |   31 +-
 .../experiment/catalog/resources/Utils.java     |    6 +-
 .../catalog/resources/WorkerResource.java       |   12 +-
 .../utils/ThriftDataModelConversion.java        |    4 +
 .../registry/core/impl/RegistryImpl.java        |   11 +-
 .../src/main/resources/META-INF/persistence.xml |   11 +-
 .../src/main/resources/appcatalog-derby.sql     |   29 +-
 .../src/main/resources/appcatalog-mysql.sql     |   28 +-
 .../src/main/resources/datacatalog-derby.sql    |   54 +
 .../src/main/resources/expcatalog-derby.sql     |   18 +-
 .../src/main/resources/expcatalog-mysql.sql     |    5 +
 ...puteAppCatalogExperimentCatResourceTest.java |    1 +
 .../app/catalog/GatewayProfileTest.java         |    2 +-
 .../airavata/data/catalog/DataCatalogTest.java  |  202 ++
 .../airavata/data/catalog/util/Initialize.java  |  315 +++
 .../catalog/AbstractResourceTest.java           |    2 +-
 .../experiment/catalog/UserResourceTest.java    |    1 +
 .../experiment/catalog/util/Initialize.java     |    1 +
 .../src/test/resources/appcatalog-derby.sql     |   29 +-
 .../src/test/resources/datacatalog-derby.sql    |   54 +
 .../src/test/resources/expcatalog-derby.sql     |   20 +-
 .../airavata/registry/cpi/AppCatalog.java       |    6 +
 .../airavata/registry/cpi/ComputeResource.java  |    5 +-
 .../airavata/registry/cpi/DataCatalog.java      |   45 +
 .../registry/cpi/DataCatalogException.java      |   36 +
 .../registry/cpi/GwyResourceProfile.java        |    6 +-
 .../apache/airavata/registry/cpi/Registry.java  |    1 +
 .../airavata/registry/cpi/StorageResource.java  |   90 +
 .../ComputeResourceRegister.java                |    6 +-
 pom.xml                                         |    1 +
 .../airavata-api/airavata_api.thrift            |  211 +-
 .../airavata-api/airavata_data_models.thrift    |    2 +
 .../airavata-api/airavata_errors.thrift         |    2 +-
 .../airavata-api/app_catalog_models.thrift      |    1 +
 .../airavata-api/compute_resource_model.thrift  |  131 +-
 .../airavata-api/data_movement_models.thrift    |  154 ++
 .../airavata-api/data_resource_models.thrift    |   44 +
 .../airavata-api/experiment_model.thrift        |    7 +-
 .../gateway_resource_profile_model.thrift       |   14 +-
 .../airavata-api/process_model.thrift           |    5 +-
 .../airavata-api/storage_resource_model.thrift  |   52 +
 .../airavata-api/task_model.thrift              |   10 +-
 .../generate-thrift-stubs.sh                    |    2 +
 .../orchestrator.cpi.service.thrift             |    2 +-
 255 files changed, 27746 insertions(+), 9054 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/72dee689/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/72dee689/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/72dee689/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/72dee689/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/72dee689/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------


Mime
View raw message