Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9462bd18 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9462bd18 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9462bd18 Branch: refs/heads/master Commit: 9462bd184566977462fd701450844ed389be06f6 Parents: 7ea88a2 a513dcd Author: Eroma Abeysinghe <[email protected]> Authored: Wed Dec 16 09:36:04 2015 -0500 Committer: Eroma Abeysinghe <[email protected]> Committed: Wed Dec 16 09:36:04 2015 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 7 +- .../api/server/handler/utils/DataCatInit.java | 315 + .../java/org/apache/airavata/api/Airavata.java | 279 +- .../airavata/api/airavata_apiConstants.java | 4 +- .../org/apache/airavata/model/Workflow.java | 1062 ++ .../ApplicationDeploymentDescription.java | 1937 +++ .../appdeployment/ApplicationModule.java | 745 + .../ApplicationParallelismType.java | 90 + .../appcatalog/appdeployment/CommandObject.java | 525 + .../appcatalog/appdeployment/SetEnvPaths.java | 629 + .../ApplicationInterfaceDescription.java | 1114 ++ .../appcatalog/computeresource/BatchQueue.java | 1029 ++ .../computeresource/CloudJobSubmission.java | 953 ++ .../ComputeResourceDescription.java | 1821 ++ .../appcatalog/computeresource/FileSystems.java | 87 + .../computeresource/GlobusJobSubmission.java | 688 + .../computeresource/JobManagerCommand.java | 102 + .../computeresource/JobSubmissionInterface.java | 637 + .../computeresource/JobSubmissionProtocol.java | 90 + .../computeresource/LOCALSubmission.java | 643 + .../appcatalog/computeresource/MonitorMode.java | 79 + .../computeresource/ProviderName.java | 69 + .../computeresource/ResourceJobManager.java | 933 + .../computeresource/ResourceJobManagerType.java | 90 + .../computeresource/SSHJobSubmission.java | 1146 ++ .../computeresource/UnicoreJobSubmission.java | 637 + .../ComputeResourcePreference.java | 1329 ++ .../gatewayprofile/GatewayResourceProfile.java | 854 + .../gatewayprofile/StoragePreference.java | 733 + .../StorageResourceDescription.java | 905 + .../airavata/model/application/io/DataType.java | 78 + .../application/io/InputDataObjectType.java | 1493 ++ .../application/io/OutputDataObjectType.java | 1393 ++ .../airavata/model/commons/ErrorModel.java | 991 ++ .../model/commons/ValidationResults.java | 562 + .../airavata/model/commons/ValidatorResult.java | 525 + .../commons/airavata_commonsConstants.java | 58 + .../airavata/model/data/movement/DMType.java | 62 + .../data/movement/DataMovementInterface.java | 637 + .../data/movement/DataMovementProtocol.java | 87 + .../data/movement/GridFTPDataMovement.java | 687 + .../model/data/movement/LOCALDataMovement.java | 420 + .../model/data/movement/SCPDataMovement.java | 754 + .../model/data/movement/SecurityProtocol.java | 88 + .../data/movement/UnicoreDataMovement.java | 635 + .../data/resource/ReplicaLocationModel.java | 462 + .../model/data/resource/ResourceModel.java | 684 + .../model/error/AiravataClientException.java | 550 + .../airavata/model/error/AiravataErrorType.java | 99 + .../model/error/AiravataSystemException.java | 545 + .../model/error/AuthenticationException.java | 413 + .../model/error/AuthorizationException.java | 413 + .../error/ExperimentNotFoundException.java | 415 + .../model/error/InvalidRequestException.java | 414 + .../model/error/LaunchValidationException.java | 524 + .../model/error/ProjectNotFoundException.java | 413 + .../airavata/model/error/TimedOutException.java | 305 + .../airavata/model/error/ValidationResults.java | 562 + .../airavata/model/error/ValidatorResult.java | 518 + .../model/experiment/ExperimentModel.java | 2504 +++ .../experiment/ExperimentSearchFields.java | 77 + .../model/experiment/ExperimentStatistics.java | 1855 ++ .../experiment/ExperimentSummaryModel.java | 1448 ++ .../model/experiment/ExperimentType.java | 62 + .../experiment/UserConfigurationDataModel.java | 1148 ++ .../org/apache/airavata/model/job/JobModel.java | 1566 ++ .../event/ExperimentStatusChangeEvent.java | 626 + .../model/messaging/event/JobIdentifier.java | 812 + .../messaging/event/JobStatusChangeEvent.java | 530 + .../event/JobStatusChangeRequestEvent.java | 530 + .../airavata/model/messaging/event/Message.java | 870 + .../model/messaging/event/MessageLevel.java | 68 + .../model/messaging/event/MessageType.java | 77 + .../messaging/event/ProcessIdentifier.java | 610 + .../event/ProcessStatusChangeEvent.java | 530 + .../event/ProcessStatusChangeRequestEvent.java | 530 + .../messaging/event/ProcessSubmitEvent.java | 711 + .../messaging/event/ProcessTerminateEvent.java | 610 + .../model/messaging/event/TaskIdentifier.java | 711 + .../messaging/event/TaskOutputChangeEvent.java | 568 + .../messaging/event/TaskStatusChangeEvent.java | 530 + .../event/TaskStatusChangeRequestEvent.java | 530 + .../airavata/model/process/ProcessModel.java | 2553 +++ .../ComputationalResourceSchedulingModel.java | 1243 ++ .../airavata/model/security/AuthzToken.java | 571 + .../airavata/model/status/ExperimentState.java | 83 + .../airavata/model/status/ExperimentStatus.java | 652 + .../apache/airavata/model/status/JobState.java | 80 + .../apache/airavata/model/status/JobStatus.java | 639 + .../airavata/model/status/ProcessState.java | 98 + .../airavata/model/status/ProcessStatus.java | 639 + .../apache/airavata/model/status/TaskState.java | 71 + .../airavata/model/status/TaskStatus.java | 639 + .../airavata/model/task/DataStageType.java | 69 + .../model/task/DataStagingTaskModel.java | 1165 ++ .../model/task/EnvironmentSetupTaskModel.java | 529 + .../model/task/JobSubmissionTaskModel.java | 649 + .../airavata/model/task/MonitorTaskModel.java | 424 + .../apache/airavata/model/task/TaskModel.java | 1441 ++ .../apache/airavata/model/task/TaskTypes.java | 78 + .../airavata/model/workspace/Gateway.java | 733 + .../apache/airavata/model/workspace/Group.java | 519 + .../airavata/model/workspace/Project.java | 1140 ++ .../apache/airavata/model/workspace/User.java | 573 + .../main/resources/lib/airavata/Airavata.cpp | 15027 ++++++++++++++++- .../src/main/resources/lib/airavata/Airavata.h | 2757 +-- .../lib/airavata/Airavata_server.skeleton.cpp | 117 +- .../lib/airavata/airavata_api_constants.cpp | 2 +- .../lib/airavata/airavata_api_constants.h | 2 +- .../lib/airavata/airavata_api_types.cpp | 2 +- .../resources/lib/airavata/airavata_api_types.h | 2 +- .../lib/airavata/airavata_commons_constants.cpp | 2 +- .../lib/airavata/airavata_commons_constants.h | 2 +- .../lib/airavata/airavata_commons_types.cpp | 58 +- .../lib/airavata/airavata_commons_types.h | 35 +- .../airavata/airavata_data_models_constants.cpp | 2 +- .../airavata/airavata_data_models_constants.h | 2 +- .../lib/airavata/airavata_data_models_types.cpp | 2 +- .../lib/airavata/airavata_data_models_types.h | 2 +- .../lib/airavata/airavata_errors_constants.cpp | 2 +- .../lib/airavata/airavata_errors_constants.h | 2 +- .../lib/airavata/airavata_errors_types.cpp | 264 +- .../lib/airavata/airavata_errors_types.h | 141 +- .../application_deployment_model_constants.cpp | 2 +- .../application_deployment_model_constants.h | 2 +- .../application_deployment_model_types.cpp | 92 +- .../application_deployment_model_types.h | 46 +- .../application_interface_model_constants.cpp | 2 +- .../application_interface_model_constants.h | 2 +- .../application_interface_model_types.cpp | 26 +- .../application_interface_model_types.h | 13 +- .../application_io_models_constants.cpp | 2 +- .../airavata/application_io_models_constants.h | 2 +- .../airavata/application_io_models_types.cpp | 68 +- .../lib/airavata/application_io_models_types.h | 24 +- .../compute_resource_model_constants.cpp | 2 +- .../airavata/compute_resource_model_constants.h | 2 +- .../airavata/compute_resource_model_types.cpp | 216 +- .../lib/airavata/compute_resource_model_types.h | 110 +- .../airavata/data_movement_models_constants.cpp | 2 +- .../airavata/data_movement_models_constants.h | 2 +- .../lib/airavata/data_movement_models_types.cpp | 90 +- .../lib/airavata/data_movement_models_types.h | 57 +- .../lib/airavata/experiment_model_constants.cpp | 2 +- .../lib/airavata/experiment_model_constants.h | 2 +- .../lib/airavata/experiment_model_types.cpp | 148 +- .../lib/airavata/experiment_model_types.h | 46 +- ...gateway_resource_profile_model_constants.cpp | 2 +- .../gateway_resource_profile_model_constants.h | 2 +- .../gateway_resource_profile_model_types.cpp | 72 +- .../gateway_resource_profile_model_types.h | 35 +- .../lib/airavata/job_model_constants.cpp | 2 +- .../lib/airavata/job_model_constants.h | 2 +- .../resources/lib/airavata/job_model_types.cpp | 38 +- .../resources/lib/airavata/job_model_types.h | 13 +- .../lib/airavata/messaging_events_constants.cpp | 2 +- .../lib/airavata/messaging_events_constants.h | 2 +- .../lib/airavata/messaging_events_types.cpp | 252 +- .../lib/airavata/messaging_events_types.h | 156 +- .../lib/airavata/process_model_constants.cpp | 2 +- .../lib/airavata/process_model_constants.h | 2 +- .../lib/airavata/process_model_types.cpp | 56 +- .../lib/airavata/process_model_types.h | 13 +- .../replica_catalog_models_constants.cpp | 2 +- .../airavata/replica_catalog_models_constants.h | 2 +- .../airavata/replica_catalog_models_types.cpp | 550 +- .../lib/airavata/replica_catalog_models_types.h | 126 +- .../lib/airavata/scheduling_model_constants.cpp | 2 +- .../lib/airavata/scheduling_model_constants.h | 2 +- .../lib/airavata/scheduling_model_types.cpp | 32 +- .../lib/airavata/scheduling_model_types.h | 13 +- .../lib/airavata/security_model_constants.cpp | 2 +- .../lib/airavata/security_model_constants.h | 2 +- .../lib/airavata/security_model_types.cpp | 18 +- .../lib/airavata/security_model_types.h | 13 +- .../lib/airavata/status_models_constants.cpp | 2 +- .../lib/airavata/status_models_constants.h | 2 +- .../lib/airavata/status_models_types.cpp | 74 +- .../lib/airavata/status_models_types.h | 46 +- .../storage_resource_model_constants.cpp | 2 +- .../airavata/storage_resource_model_constants.h | 2 +- .../airavata/storage_resource_model_types.cpp | 24 +- .../lib/airavata/storage_resource_model_types.h | 13 +- .../lib/airavata/task_model_constants.cpp | 2 +- .../lib/airavata/task_model_constants.h | 2 +- .../resources/lib/airavata/task_model_types.cpp | 110 +- .../resources/lib/airavata/task_model_types.h | 57 +- .../airavata/workflow_data_model_constants.cpp | 2 +- .../airavata/workflow_data_model_constants.h | 2 +- .../lib/airavata/workflow_data_model_types.cpp | 26 +- .../lib/airavata/workflow_data_model_types.h | 13 +- .../lib/airavata/workspace_model_constants.cpp | 2 +- .../lib/airavata/workspace_model_constants.h | 2 +- .../lib/airavata/workspace_model_types.cpp | 80 +- .../lib/airavata/workspace_model_types.h | 46 +- .../resources/lib/Airavata/API/Airavata.php | 86 +- .../resources/lib/Airavata/API/Error/Types.php | 2 +- .../main/resources/lib/Airavata/API/Types.php | 4 +- .../Model/AppCatalog/AppDeployment/Types.php | 2 +- .../Model/AppCatalog/AppInterface/Types.php | 2 +- .../Model/AppCatalog/ComputeResource/Types.php | 11 +- .../Model/AppCatalog/GatewayProfile/Types.php | 2 +- .../Model/AppCatalog/StorageResource/Types.php | 2 +- .../lib/Airavata/Model/Application/Io/Types.php | 2 +- .../lib/Airavata/Model/Commons/Types.php | 2 +- .../lib/Airavata/Model/Data/Movement/Types.php | 2 +- .../lib/Airavata/Model/Data/Resource/Types.php | 365 +- .../lib/Airavata/Model/Experiment/Types.php | 2 +- .../Airavata/Model/Messaging/Event/Types.php | 2 +- .../lib/Airavata/Model/Process/Types.php | 2 +- .../lib/Airavata/Model/Scheduling/Types.php | 2 +- .../lib/Airavata/Model/Security/Types.php | 2 +- .../lib/Airavata/Model/Status/Types.php | 2 +- .../resources/lib/Airavata/Model/Task/Types.php | 2 +- .../main/resources/lib/Airavata/Model/Types.php | 2 +- .../lib/Airavata/Model/Workspace/Types.php | 2 +- .../resources/lib/Airavata/Model/job/Types.php | 2 +- .../src/main/resources/lib/Types.php | 4 +- .../lib/apache/airavata/api/Airavata-remote | 2 +- .../lib/apache/airavata/api/Airavata.py | 3862 +++-- .../lib/apache/airavata/api/constants.py | 2 +- .../lib/apache/airavata/api/error/constants.py | 2 +- .../lib/apache/airavata/api/error/ttypes.py | 28 +- .../resources/lib/apache/airavata/api/ttypes.py | 2 +- .../model/appcatalog/appdeployment/constants.py | 2 +- .../model/appcatalog/appdeployment/ttypes.py | 32 +- .../model/appcatalog/appinterface/constants.py | 2 +- .../model/appcatalog/appinterface/ttypes.py | 10 +- .../appcatalog/computeresource/constants.py | 2 +- .../model/appcatalog/computeresource/ttypes.py | 106 +- .../appcatalog/gatewayprofile/constants.py | 2 +- .../model/appcatalog/gatewayprofile/ttypes.py | 32 +- .../appcatalog/storageresource/constants.py | 2 +- .../model/appcatalog/storageresource/ttypes.py | 10 +- .../airavata/model/application/io/constants.py | 2 +- .../airavata/model/application/io/ttypes.py | 44 +- .../apache/airavata/model/commons/constants.py | 2 +- .../lib/apache/airavata/model/commons/ttypes.py | 20 +- .../lib/apache/airavata/model/constants.py | 2 +- .../airavata/model/data/movement/constants.py | 2 +- .../airavata/model/data/movement/ttypes.py | 30 +- .../airavata/model/data/resource/constants.py | 2 +- .../airavata/model/data/resource/ttypes.py | 275 +- .../airavata/model/experiment/constants.py | 2 +- .../apache/airavata/model/experiment/ttypes.py | 74 +- .../lib/apache/airavata/model/job/constants.py | 2 +- .../lib/apache/airavata/model/job/ttypes.py | 24 +- .../airavata/model/messaging/event/constants.py | 2 +- .../airavata/model/messaging/event/ttypes.py | 68 +- .../apache/airavata/model/process/constants.py | 2 +- .../lib/apache/airavata/model/process/ttypes.py | 32 +- .../airavata/model/scheduling/constants.py | 2 +- .../apache/airavata/model/scheduling/ttypes.py | 20 +- .../apache/airavata/model/security/constants.py | 2 +- .../apache/airavata/model/security/ttypes.py | 8 +- .../apache/airavata/model/status/constants.py | 2 +- .../lib/apache/airavata/model/status/ttypes.py | 26 +- .../lib/apache/airavata/model/task/constants.py | 2 +- .../lib/apache/airavata/model/task/ttypes.py | 40 +- .../lib/apache/airavata/model/ttypes.py | 2 +- .../apache/airavata/model/workflow/constants.py | 2 +- .../apache/airavata/model/workflow/ttypes.py | 10 +- .../airavata/model/workspace/constants.py | 2 +- .../apache/airavata/model/workspace/ttypes.py | 30 +- .../org/apache/airavata/model/Workflow.java | 4 +- .../ApplicationDeploymentDescription.java | 4 +- .../appdeployment/ApplicationModule.java | 4 +- .../ApplicationParallelismType.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 6 +- .../appcatalog/appdeployment/SetEnvPaths.java | 6 +- .../ApplicationInterfaceDescription.java | 4 +- .../appcatalog/computeresource/BatchQueue.java | 14 +- .../computeresource/CloudJobSubmission.java | 4 +- .../ComputeResourceDescription.java | 8 +- .../appcatalog/computeresource/DMType.java | 62 + .../appcatalog/computeresource/FileSystems.java | 2 +- .../computeresource/GlobusJobSubmission.java | 4 +- .../computeresource/JobManagerCommand.java | 2 +- .../computeresource/JobSubmissionInterface.java | 6 +- .../computeresource/JobSubmissionProtocol.java | 2 +- .../computeresource/LOCALSubmission.java | 4 +- .../appcatalog/computeresource/MonitorMode.java | 2 +- .../computeresource/ProviderName.java | 2 +- .../computeresource/ResourceJobManager.java | 4 +- .../computeresource/ResourceJobManagerType.java | 2 +- .../computeresource/SSHJobSubmission.java | 6 +- .../computeresource/UnicoreJobSubmission.java | 4 +- .../ComputeResourcePreference.java | 6 +- .../gatewayprofile/DataStoragePreference.java | 728 + .../gatewayprofile/GatewayResourceProfile.java | 4 +- .../gatewayprofile/StoragePreference.java | 4 +- .../StorageResourceDescription.java | 6 +- .../airavata/model/application/io/DataType.java | 2 +- .../application/io/InputDataObjectType.java | 14 +- .../application/io/OutputDataObjectType.java | 12 +- .../airavata/model/commons/ErrorModel.java | 8 +- .../model/commons/ValidationResults.java | 6 +- .../airavata/model/commons/ValidatorResult.java | 6 +- .../commons/airavata_commonsConstants.java | 2 +- .../airavata/model/data/movement/DMType.java | 2 +- .../data/movement/DataMovementInterface.java | 6 +- .../data/movement/DataMovementProtocol.java | 2 +- .../data/movement/GridFTPDataMovement.java | 4 +- .../model/data/movement/LOCALDataMovement.java | 4 +- .../model/data/movement/SCPDataMovement.java | 6 +- .../model/data/movement/SecurityProtocol.java | 2 +- .../data/movement/UnicoreDataMovement.java | 4 +- .../data/resource/DataReplicaLocationModel.java | 736 +- .../model/data/resource/DataResourceModel.java | 666 +- .../model/data/resource/DataResourceType.java | 62 + .../data/resource/ReplicaLocationCategory.java | 2 +- .../data/resource/ReplicaPersistentType.java | 2 +- .../model/error/AiravataClientException.java | 4 +- .../airavata/model/error/AiravataErrorType.java | 2 +- .../model/error/AiravataSystemException.java | 4 +- .../model/error/AuthenticationException.java | 4 +- .../model/error/AuthorizationException.java | 4 +- .../error/ExperimentNotFoundException.java | 4 +- .../model/error/InvalidRequestException.java | 4 +- .../model/error/LaunchValidationException.java | 4 +- .../model/error/ProjectNotFoundException.java | 4 +- .../airavata/model/error/TimedOutException.java | 4 +- .../airavata/model/error/ValidationResults.java | 6 +- .../airavata/model/error/ValidatorResult.java | 6 +- .../model/experiment/ExperimentModel.java | 8 +- .../experiment/ExperimentSearchFields.java | 2 +- .../model/experiment/ExperimentStatistics.java | 16 +- .../experiment/ExperimentSummaryModel.java | 8 +- .../model/experiment/ExperimentType.java | 2 +- .../experiment/UserConfigurationDataModel.java | 14 +- .../org/apache/airavata/model/job/JobModel.java | 8 +- .../event/ExperimentStatusChangeEvent.java | 4 +- .../model/messaging/event/JobIdentifier.java | 4 +- .../messaging/event/JobStatusChangeEvent.java | 4 +- .../event/JobStatusChangeRequestEvent.java | 4 +- .../airavata/model/messaging/event/Message.java | 6 +- .../model/messaging/event/MessageLevel.java | 2 +- .../model/messaging/event/MessageType.java | 2 +- .../messaging/event/ProcessIdentifier.java | 4 +- .../event/ProcessStatusChangeEvent.java | 4 +- .../event/ProcessStatusChangeRequestEvent.java | 4 +- .../messaging/event/ProcessSubmitEvent.java | 4 +- .../messaging/event/ProcessTerminateEvent.java | 4 +- .../model/messaging/event/TaskIdentifier.java | 4 +- .../messaging/event/TaskOutputChangeEvent.java | 4 +- .../messaging/event/TaskStatusChangeEvent.java | 4 +- .../event/TaskStatusChangeRequestEvent.java | 4 +- .../airavata/model/process/ProcessModel.java | 12 +- .../ComputationalResourceSchedulingModel.java | 14 +- .../airavata/model/security/AuthzToken.java | 4 +- .../airavata/model/status/ExperimentState.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 6 +- .../apache/airavata/model/status/JobState.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 6 +- .../airavata/model/status/ProcessState.java | 2 +- .../airavata/model/status/ProcessStatus.java | 6 +- .../apache/airavata/model/status/TaskState.java | 2 +- .../airavata/model/status/TaskStatus.java | 6 +- .../airavata/model/task/DataStageType.java | 2 +- .../model/task/DataStagingTaskModel.java | 8 +- .../model/task/EnvironmentSetupTaskModel.java | 4 +- .../model/task/JobSubmissionTaskModel.java | 6 +- .../airavata/model/task/MonitorTaskModel.java | 4 +- .../apache/airavata/model/task/TaskModel.java | 8 +- .../apache/airavata/model/task/TaskTypes.java | 2 +- .../airavata/model/workspace/Gateway.java | 4 +- .../apache/airavata/model/workspace/Group.java | 4 +- .../airavata/model/workspace/Project.java | 6 +- .../apache/airavata/model/workspace/User.java | 4 +- .../main/resources/airavata-server.properties | 13 + .../test/resources/airavata-server.properties | 13 + .../data/catalog/core/DataManagerFactory.java | 34 + .../data/catalog/core/DataManagerImpl.java | 207 + .../catalog/core/DataManagerFactory.java | 34 - .../replica/catalog/core/DataManagerImpl.java | 207 - .../catalog/core/DataManagerFactoryTest.java | 41 + .../data/catalog/core/DataManagerImplTest.java | 206 + .../data/catalog/core/utils/AppCatInit.java | 320 + .../data/catalog/core/utils/DataCatInit.java | 315 + .../catalog/core/DataManagerFactoryTest.java | 41 - .../catalog/core/DataManagerImplTest.java | 209 - .../replica/catalog/core/utils/AppCatInit.java | 320 - .../replica/catalog/core/utils/DataCatInit.java | 315 - .../airavata/data/catalog/cpi/DataManager.java | 98 + .../data/catalog/cpi/DataManagerConstants.java | 28 + .../data/catalog/cpi/DataManagerException.java | 35 + .../replica/catalog/cpi/DataManager.java | 98 - .../catalog/cpi/DataManagerConstants.java | 28 - .../catalog/cpi/DataManagerException.java | 35 - modules/data-manager/pom.xml | 21 +- .../airavata/data/manager/DataManager.java | 67 + .../data/manager/DataManagerException.java | 35 + .../data/manager/DataManagerFactory.java | 32 + .../airavata/data/manager/DataManagerImpl.java | 92 + .../data/manager/DataManagerFactoryTest.java | 36 + .../data/manager/DataManagerImptTest.java | 141 + .../airavata/data/manager/utils/AppCatInit.java | 320 + .../data/manager/utils/DataCatInit.java | 315 + .../app/catalog/impl/ComputeResourceImpl.java | 1 + .../core/data/catalog/impl/DataCatalogImpl.java | 278 + .../core/data/catalog/model/Configuration.java | 55 + .../data/catalog/model/DataReplicaLocation.java | 197 + .../data/catalog/model/DataReplicaMetaData.java | 77 + .../catalog/model/DataReplicaMetaData_PK.java | 59 + .../core/data/catalog/model/DataResource.java | 177 + .../catalog/model/DataResourceMetaData.java | 77 + .../catalog/model/DataResourceMetaData_PK.java | 59 + .../catalog/utils/DataCatalogConstants.java | 49 + .../data/catalog/utils/DataCatalogJPAUtils.java | 82 + .../utils/DataCatalogQueryGenerator.java | 111 + .../utils/ThriftDataModelConversion.java | 213 + .../catalog/impl/RegistryFactory.java | 10 +- .../registry/core/impl/RegistryImpl.java | 6 +- .../catalog/impl/ReplicaCatalogImpl.java | 278 - .../replica/catalog/model/Configuration.java | 55 - .../catalog/model/DataReplicaLocation.java | 147 - .../catalog/model/DataReplicaMetaData.java | 77 - .../catalog/model/DataReplicaMetaData_PK.java | 59 - .../replica/catalog/model/DataResource.java | 136 - .../catalog/model/DataResourceMetaData.java | 80 - .../catalog/model/DataResourceMetaData_PK.java | 59 - .../catalog/utils/DataCatalogConstants.java | 49 - .../catalog/utils/DataCatalogJPAUtils.java | 82 - .../utils/DataCatalogQueryGenerator.java | 111 - .../utils/ThriftDataModelConversion.java | 188 - .../src/main/resources/META-INF/persistence.xml | 10 +- .../src/main/resources/datacatalog-derby.sql | 80 + .../src/main/resources/datacatalog-mysql.sql | 79 + .../src/main/resources/replicacatalog-derby.sql | 74 - .../src/main/resources/replicacatalog-mysql.sql | 73 - .../airavata/data/catalog/DataCatalogTest.java | 220 + .../airavata/data/catalog/util/Initialize.java | 315 + .../replica/catalog/ReplicaCatalogTest.java | 221 - .../replica/catalog/util/Initialize.java | 315 - .../src/test/resources/datacatalog-derby.sql | 52 + .../airavata/registry/cpi/ComputeResource.java | 1 + .../airavata/registry/cpi/DataCatalog.java | 45 + .../registry/cpi/DataCatalogException.java | 36 + .../apache/airavata/registry/cpi/Registry.java | 2 +- .../airavata/registry/cpi/ReplicaCatalog.java | 45 - .../registry/cpi/ReplicaCatalogException.java | 36 - pom.xml | 2 +- .../airavata-api/data_movement_models.thrift | 154 + .../airavata-api/data_resource_models.thrift | 45 + .../credential-store-data-models.thrift | 2 - .../component-cpis/generate-cpi-stubs.sh | 6 +- .../replica_catalog_models.thrift | 35 +- .../compute_resource_model.thrift | 5 + .../generate-thrift-stubs.sh | 2 +- 449 files changed, 94174 insertions(+), 9901 deletions(-) ----------------------------------------------------------------------
