Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/253dee8c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/253dee8c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/253dee8c Branch: refs/heads/develop Commit: 253dee8cd8771966b4ae9d8b323e1d9207f61414 Parents: ef4329c fd9b64f Author: Shameera Rathnayaka <[email protected]> Authored: Fri Mar 25 14:11:17 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Fri Mar 25 14:11:17 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 55 +- .../api/server/handler/utils/DataCatInit.java | 315 - .../server/handler/utils/ReplicaCatInit.java | 315 + .../java/org/apache/airavata/api/Airavata.java | 40373 +++++++++-------- .../main/resources/lib/airavata/Airavata.cpp | 3498 +- .../src/main/resources/lib/airavata/Airavata.h | 378 +- .../lib/airavata/Airavata_server.skeleton.cpp | 18 +- .../resources/lib/airavata/airavata_api_types.h | 2 +- .../lib/airavata/airavata_data_models_types.h | 2 +- .../airavata/application_io_models_types.cpp | 44 + .../lib/airavata/application_io_models_types.h | 24 +- .../replica_catalog_models_constants.cpp | 2 +- .../airavata/replica_catalog_models_constants.h | 2 +- .../airavata/replica_catalog_models_types.cpp | 434 +- .../lib/airavata/replica_catalog_models_types.h | 143 +- .../resources/lib/Airavata/API/Airavata.php | 11205 ++--- .../lib/Airavata/Model/Application/Io/Types.php | 46 + .../lib/Airavata/Model/Data/Replica/Types.php | 803 + .../lib/apache/airavata/api/Airavata-remote | 14 + .../lib/apache/airavata/api/Airavata.py | 594 +- .../resources/lib/apache/airavata/api/ttypes.py | 2 +- .../airavata/model/application/io/ttypes.py | 30 +- .../airavata/model/data/replica/__init__.py | 1 + .../airavata/model/data/replica/constants.py | 11 + .../airavata/model/data/replica/ttypes.py | 511 + .../lib/apache/airavata/model/ttypes.py | 2 +- .../client/samples/DataCatalogSample.java | 73 - .../client/samples/ReplicaCatalogSample.java | 72 + .../apache/airavata/model/ComponentStatus.java | 2 +- .../org/apache/airavata/model/EdgeModel.java | 2 +- .../org/apache/airavata/model/NodeModel.java | 2 +- .../org/apache/airavata/model/PortModel.java | 2 +- .../apache/airavata/model/WorkflowModel.java | 2 +- .../apache/airavata/model/WorkflowStatus.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 2 +- .../gatewayprofile/GatewayResourceProfile.java | 2 +- .../gatewayprofile/StoragePreference.java | 2 +- .../StorageResourceDescription.java | 2 +- .../application/io/InputDataObjectType.java | 116 +- .../application/io/OutputDataObjectType.java | 116 +- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.java | 2 +- .../data/movement/DataMovementInterface.java | 2 +- .../data/movement/GridFTPDataMovement.java | 2 +- .../model/data/movement/LOCALDataMovement.java | 2 +- .../model/data/movement/SCPDataMovement.java | 2 +- .../data/movement/UnicoreDataMovement.java | 2 +- .../model/data/product/DataProductModel.java | 1943 - .../model/data/product/DataProductType.java | 65 - .../data/product/DataReplicaLocationModel.java | 1635 - .../data/product/ReplicaLocationCategory.java | 68 - .../data/product/ReplicaPersistentType.java | 62 - .../model/data/replica/DataProductModel.java | 1677 + .../model/data/replica/DataProductType.java | 62 + .../data/replica/DataReplicaLocationModel.java | 1635 + .../data/replica/ReplicaLocationCategory.java | 68 + .../data/replica/ReplicaPersistentType.java | 62 + .../model/error/AiravataClientException.java | 2 +- .../model/error/AiravataSystemException.java | 2 +- .../model/error/AuthenticationException.java | 2 +- .../model/error/AuthorizationException.java | 2 +- .../error/ExperimentNotFoundException.java | 2 +- .../model/error/InvalidRequestException.java | 2 +- .../model/error/LaunchValidationException.java | 2 +- .../model/error/ProjectNotFoundException.java | 2 +- .../airavata/model/error/TimedOutException.java | 2 +- .../airavata/model/error/ValidationResults.java | 2 +- .../airavata/model/error/ValidatorResult.java | 2 +- .../model/experiment/ExperimentModel.java | 2 +- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 2 +- .../org/apache/airavata/model/job/JobModel.java | 2 +- .../event/ExperimentStatusChangeEvent.java | 2 +- .../model/messaging/event/JobIdentifier.java | 2 +- .../messaging/event/JobStatusChangeEvent.java | 2 +- .../event/JobStatusChangeRequestEvent.java | 2 +- .../airavata/model/messaging/event/Message.java | 2 +- .../messaging/event/ProcessIdentifier.java | 2 +- .../event/ProcessStatusChangeEvent.java | 2 +- .../event/ProcessStatusChangeRequestEvent.java | 2 +- .../messaging/event/ProcessSubmitEvent.java | 2 +- .../messaging/event/ProcessTerminateEvent.java | 2 +- .../model/messaging/event/TaskIdentifier.java | 2 +- .../messaging/event/TaskOutputChangeEvent.java | 2 +- .../messaging/event/TaskStatusChangeEvent.java | 2 +- .../event/TaskStatusChangeRequestEvent.java | 2 +- .../airavata/model/process/ProcessModel.java | 2 +- .../ComputationalResourceSchedulingModel.java | 2 +- .../airavata/model/security/AuthzToken.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 2 +- .../airavata/model/status/ProcessStatus.java | 2 +- .../airavata/model/status/TaskStatus.java | 2 +- .../model/task/DataStagingTaskModel.java | 2 +- .../model/task/EnvironmentSetupTaskModel.java | 2 +- .../model/task/JobSubmissionTaskModel.java | 2 +- .../airavata/model/task/MonitorTaskModel.java | 2 +- .../apache/airavata/model/task/TaskModel.java | 2 +- .../airavata/model/workspace/Gateway.java | 2 +- .../apache/airavata/model/workspace/Group.java | 2 +- .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../main/resources/airavata-server.properties | 14 +- .../test/resources/airavata-server.properties | 16 +- .../apache/airavata/gfac/core/GFacUtils.java | 19 +- .../server/OrchestratorServerHandler.java | 12 +- .../core/data/catalog/impl/DataCatalogImpl.java | 355 - .../core/data/catalog/model/Configuration.java | 55 - .../core/data/catalog/model/DataProduct.java | 187 - .../data/catalog/model/DataProductMetaData.java | 77 - .../catalog/model/DataProductMetaData_PK.java | 59 - .../data/catalog/model/DataReplicaLocation.java | 169 - .../data/catalog/model/DataReplicaMetaData.java | 77 - .../catalog/model/DataReplicaMetaData_PK.java | 59 - .../catalog/utils/DataCatalogConstants.java | 49 - .../data/catalog/utils/DataCatalogJPAUtils.java | 82 - .../utils/DataCatalogQueryGenerator.java | 111 - .../utils/ThriftDataModelConversion.java | 215 - .../catalog/impl/ExperimentRegistry.java | 9 +- .../catalog/impl/RegistryFactory.java | 10 +- .../catalog/model/ExperimentInput.java | 10 + .../catalog/model/ExperimentOutput.java | 11 + .../experiment/catalog/model/ProcessInput.java | 11 + .../experiment/catalog/model/ProcessOutput.java | 11 + .../resources/ExperimentInputResource.java | 10 + .../resources/ExperimentOutputResource.java | 10 + .../catalog/resources/ProcessInputResource.java | 10 + .../resources/ProcessOutputResource.java | 10 + .../utils/ThriftDataModelConversion.java | 4 + .../registry/core/impl/RegistryImpl.java | 6 +- .../catalog/impl/ReplicaCatalogImpl.java | 366 + .../replica/catalog/model/Configuration.java | 55 + .../core/replica/catalog/model/DataProduct.java | 177 + .../catalog/model/DataProductMetaData.java | 77 + .../catalog/model/DataProductMetaData_PK.java | 59 + .../catalog/model/DataReplicaLocation.java | 169 + .../catalog/model/DataReplicaMetaData.java | 77 + .../catalog/model/DataReplicaMetaData_PK.java | 59 + .../catalog/utils/ReplicaCatalogConstants.java | 49 + .../catalog/utils/ReplicaCatalogJPAUtils.java | 82 + .../utils/ReplicaCatalogQueryGenerator.java | 111 + .../utils/ThriftDataModelConversion.java | 203 + .../src/main/resources/META-INF/persistence.xml | 12 +- .../src/main/resources/datacatalog-derby.sql | 78 - .../src/main/resources/datacatalog-mysql.sql | 77 - .../src/main/resources/expcatalog-derby.sql | 4 + .../src/main/resources/expcatalog-mysql.sql | 4 + .../src/main/resources/replicacatalog-derby.sql | 77 + .../src/main/resources/replicacatalog-mysql.sql | 76 + .../airavata/data/catalog/DataCatalogTest.java | 100 - .../airavata/data/catalog/util/Initialize.java | 315 - .../replica/catalog/ReplicaCatalogTest.java | 99 + .../replica/catalog/util/Initialize.java | 315 + .../airavata/registry/cpi/DataCatalog.java | 50 - .../registry/cpi/DataCatalogException.java | 35 - .../apache/airavata/registry/cpi/Registry.java | 2 +- .../airavata/registry/cpi/ReplicaCatalog.java | 54 + .../registry/cpi/ReplicaCatalogException.java | 35 + .../airavata-apis/airavata_api.thrift | 21 +- .../data-models/airavata_data_models.thrift | 2 +- .../application_io_models.thrift | 6 +- .../data_catalog_models.thrift | 73 - .../replica_catalog_models.thrift | 70 + 179 files changed, 39224 insertions(+), 32067 deletions(-) ----------------------------------------------------------------------
