You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/06/04 22:37:37 UTC
[51/52] [abbrv] [partial] airavata git commit: registry refactoring
registry refactoring
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ec8c6202
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ec8c6202
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ec8c6202
Branch: refs/heads/master
Commit: ec8c6202a1f3e8f7f61ac8ae4dee3019a058169a
Parents: e34df6a
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Jun 4 16:33:08 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Jun 4 16:33:08 2015 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 195 +-
.../AiravataExperimentStatusUpdator.java | 24 +-
.../api/server/util/DataModelUtils.java | 4 +-
.../api/server/util/DatabaseCreator.java | 4 +-
.../api/server/util/RegistryInitUtil.java | 12 +-
.../client/samples/CreateLaunchExperiment.java | 2 +-
.../org/airavata/appcatalog/cpi/AppCatalog.java | 54 -
.../appcatalog/cpi/AppCatalogException.java | 36 -
.../appcatalog/cpi/ApplicationDeployment.java | 72 -
.../appcatalog/cpi/ApplicationInterface.java | 148 -
.../appcatalog/cpi/ComputeResource.java | 249 --
.../appcatalog/cpi/GwyResourceProfile.java | 81 -
.../appcatalog/cpi/WorkflowCatalog.java | 45 -
.../catalog/data/impl/AppCatalogFactory.java | 46 -
.../catalog/data/impl/AppCatalogImpl.java | 52 -
.../data/impl/ApplicationDeploymentImpl.java | 414 ---
.../data/impl/ApplicationInterfaceImpl.java | 450 ---
.../catalog/data/impl/ComputeResourceImpl.java | 888 ------
.../data/impl/GwyResourceProfileImpl.java | 252 --
.../catalog/data/impl/WorkflowCatalogImpl.java | 232 --
.../catalog/data/model/AppEnvironment.java | 76 -
.../catalog/data/model/AppEnvironment_PK.java | 64 -
.../catalog/data/model/AppInput_PK.java | 64 -
.../catalog/data/model/AppModuleMapping.java | 77 -
.../catalog/data/model/AppModuleMapping_PK.java | 64 -
.../catalog/data/model/AppOutput_PK.java | 64 -
.../data/model/ApplicationDeployment.java | 148 -
.../catalog/data/model/ApplicationInput.java | 166 -
.../data/model/ApplicationInterface.java | 97 -
.../catalog/data/model/ApplicationModule.java | 107 -
.../catalog/data/model/ApplicationOutput.java | 146 -
.../catalog/data/model/BatchQueue.java | 144 -
.../catalog/data/model/BatchQueue_PK.java | 63 -
.../catalog/data/model/CloudJobSubmission.java | 102 -
.../catalog/data/model/ComputeResource.java | 105 -
.../data/model/ComputeResourceFileSystem.java | 89 -
.../model/ComputeResourceFileSystem_PK.java | 62 -
.../data/model/ComputeResourcePreference.java | 154 -
.../data/model/ComputeResourcePreferencePK.java | 64 -
.../catalog/data/model/Configuration.java | 57 -
.../catalog/data/model/Configuration_PK.java | 65 -
.../data/model/DataMovementInterface.java | 124 -
.../data/model/DataMovementInterface_PK.java | 62 -
.../data/model/DataMovementProtocol.java | 76 -
.../data/model/DataMovementProtocolPK.java | 74 -
.../catalog/data/model/GSISSHExport.java | 73 -
.../catalog/data/model/GSISSHExportPK.java | 64 -
.../catalog/data/model/GSISSHSubmission.java | 82 -
.../catalog/data/model/GatewayProfile.java | 68 -
.../catalog/data/model/GlobusGKEndPointPK.java | 64 -
.../catalog/data/model/GlobusGKEndpoint.java | 65 -
.../catalog/data/model/GlobusJobSubmission.java | 62 -
.../catalog/data/model/GridftpDataMovement.java | 83 -
.../catalog/data/model/GridftpEndpoint.java | 102 -
.../catalog/data/model/GridftpEndpoint_PK.java | 62 -
.../catalog/data/model/HostAlias.java | 65 -
.../catalog/data/model/HostAliasPK.java | 64 -
.../catalog/data/model/HostIPAddress.java | 65 -
.../catalog/data/model/HostIPAddressPK.java | 64 -
.../catalog/data/model/JobManagerCommand.java | 89 -
.../data/model/JobManagerCommand_PK.java | 62 -
.../data/model/JobSubmissionInterface.java | 124 -
.../data/model/JobSubmissionInterface_PK.java | 62 -
.../data/model/JobSubmissionProtocol.java | 77 -
.../data/model/JobSubmissionProtocolPK.java | 74 -
.../catalog/data/model/LibraryApendPath.java | 76 -
.../catalog/data/model/LibraryApendPath_PK.java | 64 -
.../catalog/data/model/LibraryPrepandPath.java | 76 -
.../data/model/LibraryPrepandPath_PK.java | 64 -
.../catalog/data/model/LocalDataMovement.java | 49 -
.../catalog/data/model/LocalSubmission.java | 98 -
.../catalog/data/model/ModuleLoadCmd.java | 70 -
.../catalog/data/model/ModuleLoadCmd_PK.java | 63 -
.../catalog/data/model/PostJobCommand.java | 73 -
.../catalog/data/model/PostJobCommandPK.java | 64 -
.../catalog/data/model/PreJobCommand.java | 73 -
.../catalog/data/model/PreJobCommandPK.java | 64 -
.../catalog/data/model/ResourceJobManager.java | 106 -
.../catalog/data/model/ScpDataMovement.java | 117 -
.../catalog/data/model/SshJobSubmission.java | 144 -
.../catalog/data/model/UnicoreDataMovement.java | 65 -
.../data/model/UnicoreJobSubmission.java | 66 -
.../catalog/data/model/Workflow.java | 126 -
.../catalog/data/model/WorkflowInput.java | 167 -
.../catalog/data/model/WorkflowInput_PK.java | 64 -
.../catalog/data/model/WorkflowOutput.java | 117 -
.../catalog/data/model/WorkflowOutput_PK.java | 64 -
.../data/resources/AbstractResource.java | 382 ---
.../data/resources/AppDeploymentResource.java | 446 ---
.../data/resources/AppEnvironmentResource.java | 293 --
.../data/resources/AppInterfaceResource.java | 363 ---
.../resources/AppModuleMappingResource.java | 317 --
.../data/resources/AppModuleResource.java | 344 --
.../resources/ApplicationInputResource.java | 454 ---
.../resources/ApplicationOutputResource.java | 432 ---
.../data/resources/BatchQueueResource.java | 357 ---
.../data/resources/CloudSubmissionResource.java | 299 --
.../ComputeHostPreferenceResource.java | 413 ---
.../ComputeResourceFileSystemResource.java | 307 --
.../data/resources/ComputeResourceResource.java | 351 ---
.../DataMovementInterfaceResource.java | 339 --
.../resources/DataMovementProtocolResource.java | 360 ---
.../data/resources/GSISSHExportResource.java | 324 --
.../resources/GSISSHSubmissionResource.java | 374 ---
.../data/resources/GatewayProfileResource.java | 318 --
.../resources/GlobusGKEndpointResource.java | 321 --
.../resources/GlobusJobSubmissionResource.java | 316 --
.../resources/GridftpDataMovementResource.java | 279 --
.../data/resources/GridftpEndpointResource.java | 317 --
.../data/resources/HostAliasResource.java | 317 --
.../data/resources/HostIPAddressResource.java | 318 --
.../resources/JobManagerCommandResource.java | 307 --
.../JobSubmissionInterfaceResource.java | 339 --
.../JobSubmissionProtocolResource.java | 359 ---
.../resources/LibraryApendPathResource.java | 292 --
.../resources/LibraryPrepandPathResource.java | 291 --
.../resources/LocalDataMovementResource.java | 249 --
.../data/resources/LocalSubmissionResource.java | 293 --
.../data/resources/ModuleLoadCmdResource.java | 300 --
.../data/resources/PostJobCommandResource.java | 333 --
.../data/resources/PreJobCommandResource.java | 333 --
.../catalog/data/resources/Resource.java | 89 -
.../resources/ResourceJobManagerResource.java | 301 --
.../data/resources/ScpDataMovementResource.java | 308 --
.../resources/SshJobSubmissionResource.java | 332 --
.../resources/UnicoreDataMovementResource.java | 255 --
.../resources/UnicoreJobSubmissionResource.java | 328 --
.../data/resources/WorkflowInputResource.java | 451 ---
.../data/resources/WorkflowOutputResource.java | 410 ---
.../data/resources/WorkflowResource.java | 382 ---
.../catalog/data/util/AppCatalogJPAUtils.java | 911 ------
.../data/util/AppCatalogQueryGenerator.java | 90 -
.../data/util/AppCatalogResourceType.java | 66 -
.../data/util/AppCatalogThriftConversion.java | 800 -----
.../catalog/data/util/AppCatalogUtils.java | 31 -
.../src/main/resources/META-INF/persistence.xml | 67 -
.../src/main/resources/appcatalog-derby.sql | 460 ---
.../src/main/resources/appcatalog-mysql.sql | 453 ---
.../app/catalog/test/AppDeploymentTest.java | 147 -
.../app/catalog/test/AppInterfaceTest.java | 192 --
.../app/catalog/test/ComputeResourceTest.java | 298 --
.../app/catalog/test/GatewayProfileTest.java | 128 -
.../app/catalog/test/util/Initialize.java | 320 --
.../gaussian/handler/GaussianHandler.java | 4 +-
.../gfac/bes/handlers/AbstractSMSHandler.java | 2 +-
.../gfac/bes/provider/impl/BESProvider.java | 2 +-
.../org/apache/airavata/gfac/Scheduler.java | 4 +-
.../org/apache/airavata/gfac/core/GFac.java | 8 +-
.../apache/airavata/gfac/core/GFacUtils.java | 33 +-
.../gfac/core/context/JobExecutionContext.java | 16 +-
.../gfac/core/handler/AbstractHandler.java | 20 +-
.../gfac/core/provider/AbstractProvider.java | 12 +-
.../handler/GSISSHDirectorySetupHandler.java | 6 +-
.../gfac/gsissh/handler/GSISSHInputHandler.java | 6 +-
.../gsissh/handler/GSISSHOutputHandler.java | 12 +-
.../gsissh/handler/NewGSISSHOutputHandler.java | 4 +-
.../gsissh/provider/impl/GSISSHProvider.java | 2 +-
.../gfac/gsissh/util/GFACGSISSHUtils.java | 2 +-
.../gfac/impl/AiravataJobStatusUpdator.java | 22 +-
.../gfac/impl/AiravataTaskStatusUpdator.java | 22 +-
.../impl/AiravataWorkflowNodeStatusUpdator.java | 22 +-
.../airavata/gfac/impl/BetterGfacImpl.java | 26 +-
.../gfac/local/provider/impl/LocalProvider.java | 10 +-
.../ssh/handler/AdvancedSCPInputHandler.java | 4 +-
.../ssh/handler/AdvancedSCPOutputHandler.java | 4 +-
.../gfac/ssh/handler/NewSSHOutputHandler.java | 4 +-
.../ssh/handler/SSHDirectorySetupHandler.java | 6 +-
.../gfac/ssh/handler/SSHInputHandler.java | 6 +-
.../gfac/ssh/handler/SSHOutputHandler.java | 12 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 2 +-
.../airavata/gfac/ssh/util/GFACSSHUtils.java | 4 +-
.../apache/airavata/job/AMQPMonitorTest.java | 2 +-
.../airavata/gfac/server/GfacServerHandler.java | 32 +-
.../gfac/client/GfacClientFactoryTest.java | 4 +-
.../airavata/gfac/client/util/Initialize.java | 4 +-
.../airavata/integration/DataRetrievalIT.java | 2 +-
.../integration/tools/DocumentCreatorNew.java | 5 +-
.../integration/tools/DocumentCreatorUtils.java | 3 +-
.../validator/impl/BatchQueueValidator.java | 2 +-
.../cpi/impl/AbstractOrchestrator.java | 2 +-
.../orchestrator/core/util/Initialize.java | 4 +-
.../server/OrchestratorServerHandler.java | 96 +-
.../orchestrator/util/DataModelUtils.java | 4 +-
.../orchestrator/client/util/Initialize.java | 4 +-
modules/registry/experiment-catalog/pom.xml | 151 -
.../experiment/catalog/JPAConstants.java | 33 -
.../airavata/experiment/catalog/Resource.java | 71 -
.../experiment/catalog/ResourceType.java | 50 -
.../experiment/catalog/ResourceUtils.java | 525 ---
.../catalog/impl/ExperimentRegistry.java | 2983 ------------------
.../catalog/impl/GatewayRegistry.java | 115 -
.../catalog/impl/LoggingRegistryImpl.java | 97 -
.../catalog/impl/ProjectRegistry.java | 303 --
.../catalog/impl/RegistryFactory.java | 80 -
.../experiment/catalog/impl/RegistryImpl.java | 735 -----
.../experiment/catalog/impl/UserReg.java | 41 -
.../model/AdvancedInputDataHandling.java | 113 -
.../model/AdvancedOutputDataHandling.java | 104 -
.../catalog/model/ApplicationInput.java | 165 -
.../catalog/model/ApplicationInput_PK.java | 65 -
.../catalog/model/ApplicationOutput.java | 142 -
.../catalog/model/ApplicationOutput_PK.java | 64 -
.../Computational_Resource_Scheduling.java | 174 -
.../experiment/catalog/model/Configuration.java | 80 -
.../catalog/model/Configuration_PK.java | 74 -
.../catalog/model/DataTransferDetail.java | 91 -
.../experiment/catalog/model/ErrorDetail.java | 176 --
.../experiment/catalog/model/Experiment.java | 299 --
.../catalog/model/ExperimentConfigData.java | 142 -
.../catalog/model/Experiment_Input.java | 170 -
.../catalog/model/Experiment_Input_PK.java | 64 -
.../catalog/model/Experiment_Output.java | 143 -
.../catalog/model/Experiment_Output_PK.java | 64 -
.../experiment/catalog/model/Gateway.java | 76 -
.../catalog/model/Gateway_Worker.java | 82 -
.../catalog/model/Gateway_Worker_PK.java | 64 -
.../experiment/catalog/model/JobDetail.java | 135 -
.../experiment/catalog/model/JobDetails_PK.java | 64 -
.../experiment/catalog/model/NodeInput.java | 163 -
.../experiment/catalog/model/NodeInput_PK.java | 64 -
.../experiment/catalog/model/NodeOutput.java | 140 -
.../experiment/catalog/model/NodeOutput_PK.java | 64 -
.../catalog/model/Notification_Email.java | 81 -
.../experiment/catalog/model/Project.java | 125 -
.../experiment/catalog/model/ProjectUser.java | 81 -
.../catalog/model/ProjectUser_PK.java | 64 -
.../experiment/catalog/model/QosParam.java | 103 -
.../experiment/catalog/model/Status.java | 146 -
.../experiment/catalog/model/TaskDetail.java | 221 --
.../experiment/catalog/model/Users.java | 55 -
.../catalog/model/WorkflowNodeDetail.java | 155 -
.../catalog/resources/AbstractResource.java | 317 --
.../AdvanceInputDataHandlingResource.java | 160 -
.../AdvancedOutputDataHandlingResource.java | 150 -
.../resources/ApplicationInputResource.java | 230 --
.../resources/ApplicationOutputResource.java | 208 --
.../ComputationSchedulingResource.java | 221 --
.../catalog/resources/ConfigDataResource.java | 194 --
.../resources/ConfigurationResource.java | 204 --
.../resources/DataTransferDetailResource.java | 276 --
.../catalog/resources/ErrorDetailResource.java | 215 --
.../resources/ExperimentInputResource.java | 225 --
.../resources/ExperimentOutputResource.java | 204 --
.../catalog/resources/ExperimentResource.java | 831 -----
.../resources/ExperimentSummaryResource.java | 134 -
.../catalog/resources/GatewayResource.java | 437 ---
.../catalog/resources/JobDetailResource.java | 376 ---
.../catalog/resources/NodeInputResource.java | 227 --
.../catalog/resources/NodeOutputResource.java | 207 --
.../resources/NotificationEmailResource.java | 119 -
.../catalog/resources/ProjectResource.java | 508 ---
.../catalog/resources/ProjectUserResource.java | 123 -
.../catalog/resources/QosParamResource.java | 144 -
.../catalog/resources/StatusResource.java | 181 --
.../catalog/resources/TaskDetailResource.java | 748 -----
.../catalog/resources/UserResource.java | 186 --
.../experiment/catalog/resources/Utils.java | 1011 ------
.../catalog/resources/WorkerResource.java | 725 -----
.../resources/WorkflowNodeDetailResource.java | 515 ---
.../catalog/utils/QueryGenerator.java | 128 -
.../utils/ThriftDataModelConversion.java | 686 ----
.../src/main/resources/META-INF/persistence.xml | 65 -
.../src/main/resources/registry-derby.sql | 391 ---
.../src/main/resources/registry-mysql.sql | 392 ---
.../catalog/AbstractResourceTest.java | 91 -
.../catalog/ComputationalSchedulingTest.java | 84 -
.../catalog/ConfigurationResourceTest.java | 58 -
.../catalog/ExecutionErrorResourceTest.java | 95 -
.../catalog/ExperimentDataResourceTest.java | 107 -
.../catalog/ExperimentInputResourceTest.java | 75 -
.../catalog/ExperimentMetadataResourceTest.java | 87 -
.../catalog/ExperimentOutputResourceTest.java | 76 -
.../catalog/ExperimentResourceTest.java | 77 -
.../catalog/GFacJobDataResourceTest.java | 77 -
.../catalog/GFacJobStatusResourceTest.java | 87 -
.../experiment/catalog/GatewayResourceTest.java | 120 -
.../catalog/GramDataResourceTest.java | 72 -
.../catalog/NodeDataResourceTest.java | 72 -
.../catalog/OrchestratorDataResourceTest.java | 69 -
.../experiment/catalog/RegistryUseCaseTest.java | 296 --
.../catalog/TaskDetailResourceTest.java | 93 -
.../experiment/catalog/UserResourceTest.java | 54 -
.../experiment/catalog/WorkerResourceTest.java | 122 -
.../catalog/WorkflowDataResourceTest.java | 106 -
.../catalog/WorkflowNodeDetailResourceTest.java | 85 -
.../experiment/catalog/util/Initialize.java | 333 --
.../src/test/resources/registry-derby.sql | 391 ---
modules/registry/pom.xml | 2 +-
modules/registry/registry-core/pom.xml | 147 +
.../app/catalog/impl/AppCatalogFactory.java | 46 +
.../core/app/catalog/impl/AppCatalogImpl.java | 52 +
.../catalog/impl/ApplicationDeploymentImpl.java | 413 +++
.../catalog/impl/ApplicationInterfaceImpl.java | 450 +++
.../app/catalog/impl/ComputeResourceImpl.java | 888 ++++++
.../catalog/impl/GwyResourceProfileImpl.java | 252 ++
.../app/catalog/impl/WorkflowCatalogImpl.java | 232 ++
.../core/app/catalog/model/AppEnvironment.java | 76 +
.../app/catalog/model/AppEnvironment_PK.java | 64 +
.../core/app/catalog/model/AppInput_PK.java | 64 +
.../app/catalog/model/AppModuleMapping.java | 77 +
.../app/catalog/model/AppModuleMapping_PK.java | 64 +
.../core/app/catalog/model/AppOutput_PK.java | 64 +
.../catalog/model/ApplicationDeployment.java | 148 +
.../app/catalog/model/ApplicationInput.java | 166 +
.../app/catalog/model/ApplicationInterface.java | 97 +
.../app/catalog/model/ApplicationModule.java | 107 +
.../app/catalog/model/ApplicationOutput.java | 146 +
.../core/app/catalog/model/BatchQueue.java | 144 +
.../core/app/catalog/model/BatchQueue_PK.java | 63 +
.../app/catalog/model/CloudJobSubmission.java | 102 +
.../core/app/catalog/model/ComputeResource.java | 105 +
.../model/ComputeResourceFileSystem.java | 89 +
.../model/ComputeResourceFileSystem_PK.java | 62 +
.../model/ComputeResourcePreference.java | 154 +
.../model/ComputeResourcePreferencePK.java | 64 +
.../core/app/catalog/model/Configuration.java | 56 +
.../app/catalog/model/Configuration_PK.java | 65 +
.../catalog/model/DataMovementInterface.java | 124 +
.../catalog/model/DataMovementInterface_PK.java | 62 +
.../app/catalog/model/DataMovementProtocol.java | 76 +
.../catalog/model/DataMovementProtocolPK.java | 74 +
.../core/app/catalog/model/GSISSHExport.java | 73 +
.../core/app/catalog/model/GSISSHExportPK.java | 64 +
.../app/catalog/model/GSISSHSubmission.java | 82 +
.../core/app/catalog/model/GatewayProfile.java | 68 +
.../app/catalog/model/GlobusGKEndPointPK.java | 64 +
.../app/catalog/model/GlobusGKEndpoint.java | 65 +
.../app/catalog/model/GlobusJobSubmission.java | 62 +
.../app/catalog/model/GridftpDataMovement.java | 83 +
.../core/app/catalog/model/GridftpEndpoint.java | 102 +
.../app/catalog/model/GridftpEndpoint_PK.java | 62 +
.../core/app/catalog/model/HostAlias.java | 64 +
.../core/app/catalog/model/HostAliasPK.java | 64 +
.../core/app/catalog/model/HostIPAddress.java | 65 +
.../core/app/catalog/model/HostIPAddressPK.java | 64 +
.../app/catalog/model/JobManagerCommand.java | 89 +
.../app/catalog/model/JobManagerCommand_PK.java | 62 +
.../catalog/model/JobSubmissionInterface.java | 124 +
.../model/JobSubmissionInterface_PK.java | 62 +
.../catalog/model/JobSubmissionProtocol.java | 77 +
.../catalog/model/JobSubmissionProtocolPK.java | 74 +
.../app/catalog/model/LibraryApendPath.java | 76 +
.../app/catalog/model/LibraryApendPath_PK.java | 64 +
.../app/catalog/model/LibraryPrepandPath.java | 76 +
.../catalog/model/LibraryPrepandPath_PK.java | 64 +
.../app/catalog/model/LocalDataMovement.java | 49 +
.../core/app/catalog/model/LocalSubmission.java | 98 +
.../core/app/catalog/model/ModuleLoadCmd.java | 70 +
.../app/catalog/model/ModuleLoadCmd_PK.java | 63 +
.../core/app/catalog/model/PostJobCommand.java | 73 +
.../app/catalog/model/PostJobCommandPK.java | 64 +
.../core/app/catalog/model/PreJobCommand.java | 73 +
.../core/app/catalog/model/PreJobCommandPK.java | 64 +
.../app/catalog/model/ResourceJobManager.java | 106 +
.../core/app/catalog/model/ScpDataMovement.java | 117 +
.../app/catalog/model/SshJobSubmission.java | 144 +
.../app/catalog/model/UnicoreDataMovement.java | 65 +
.../app/catalog/model/UnicoreJobSubmission.java | 66 +
.../core/app/catalog/model/Workflow.java | 126 +
.../core/app/catalog/model/WorkflowInput.java | 167 +
.../app/catalog/model/WorkflowInput_PK.java | 64 +
.../core/app/catalog/model/WorkflowOutput.java | 117 +
.../app/catalog/model/WorkflowOutput_PK.java | 64 +
.../app/catalog/resources/AbstractResource.java | 382 +++
.../resources/AppCatAbstractResource.java | 382 +++
.../catalog/resources/AppCatalogResource.java | 90 +
.../AppDeploymentAppCatalogResourceAppCat.java | 446 +++
.../resources/AppDeploymentResource.java | 446 +++
.../AppEnvironmentAppCatalogResourceAppCat.java | 293 ++
.../resources/AppEnvironmentResource.java | 293 ++
.../AppInterfaceAppCatalogResourceAppCat.java | 363 +++
.../catalog/resources/AppInterfaceResource.java | 363 +++
.../AppModuleAppCatalogResourceAppCat.java | 344 ++
...ppModuleMappingAppCatalogResourceAppCat.java | 317 ++
.../resources/AppModuleMappingResource.java | 317 ++
.../catalog/resources/AppModuleResource.java | 344 ++
...pplicationInputAppCatalogResourceAppCat.java | 454 +++
.../resources/ApplicationInputResource.java | 454 +++
...plicationOutputAppCatalogResourceAppCat.java | 433 +++
.../resources/ApplicationOutputResource.java | 432 +++
.../BatchQueueAppCatalogResourceAppCat.java | 357 +++
.../catalog/resources/BatchQueueResource.java | 357 +++
...CloudSubmissionAppCatalogResourceAppCat.java | 298 ++
.../resources/CloudSubmissionResource.java | 298 ++
...eHostPreferenceAppCatalogResourceAppCat.java | 413 +++
.../ComputeHostPreferenceResource.java | 413 +++
...ComputeResourceAppCatalogResourceAppCat.java | 351 +++
...ourceFileSystemAppCatalogResourceAppCat.java | 307 ++
.../ComputeResourceFileSystemResource.java | 307 ++
.../resources/ComputeResourceResource.java | 351 +++
...vementInterfaceAppCatalogResourceAppCat.java | 339 ++
.../DataMovementInterfaceResource.java | 339 ++
.../resources/DataMovementProtocolResource.java | 360 +++
.../GSISSHExportAppCatalogResourceAppCat.java | 324 ++
.../catalog/resources/GSISSHExportResource.java | 324 ++
...SISSHSubmissionAppCatalogResourceAppCat.java | 373 +++
.../resources/GSISSHSubmissionResource.java | 373 +++
.../GatewayProfileAppCatalogResourceAppCat.java | 318 ++
.../resources/GatewayProfileResource.java | 318 ++
...lobusGKEndpointAppCatalogResourceAppCat.java | 323 ++
.../resources/GlobusGKEndpointResource.java | 321 ++
...usJobSubmissionAppCatalogResourceAppCat.java | 315 ++
.../resources/GlobusJobSubmissionResource.java | 315 ++
...ftpDataMovementAppCatalogResourceAppCat.java | 279 ++
.../resources/GridftpDataMovementResource.java | 279 ++
...GridftpEndpointAppCatalogResourceAppCat.java | 317 ++
.../resources/GridftpEndpointResource.java | 317 ++
.../HostAliasAppCatalogResourceAppCat.java | 317 ++
.../catalog/resources/HostAliasResource.java | 317 ++
.../HostIPAddressAppCatalogResourceAppCat.java | 318 ++
.../resources/HostIPAddressResource.java | 318 ++
...bManagerCommandAppCatalogResourceAppCat.java | 307 ++
.../resources/JobManagerCommandResource.java | 307 ++
...issionInterfaceAppCatalogResourceAppCat.java | 339 ++
.../JobSubmissionInterfaceResource.java | 339 ++
.../JobSubmissionProtocolResource.java | 359 +++
...ibraryApendPathAppCatalogResourceAppCat.java | 292 ++
.../resources/LibraryApendPathResource.java | 292 ++
...raryPrepandPathAppCatalogResourceAppCat.java | 291 ++
.../resources/LibraryPrepandPathResource.java | 291 ++
...calDataMovementAppCatalogResourceAppCat.java | 249 ++
.../resources/LocalDataMovementResource.java | 249 ++
...LocalSubmissionAppCatalogResourceAppCat.java | 293 ++
.../resources/LocalSubmissionResource.java | 293 ++
.../ModuleLoadCmdAppCatalogResourceAppCat.java | 300 ++
.../resources/ModuleLoadCmdResource.java | 300 ++
.../PostJobCommandAppCatalogResourceAppCat.java | 333 ++
.../resources/PostJobCommandResource.java | 333 ++
.../PreJobCommandAppCatalogResourceAppCat.java | 333 ++
.../resources/PreJobCommandResource.java | 333 ++
.../core/app/catalog/resources/Resource.java | 89 +
...ourceJobManagerAppCatalogResourceAppCat.java | 301 ++
.../resources/ResourceJobManagerResource.java | 301 ++
...ScpDataMovementAppCatalogResourceAppCat.java | 308 ++
.../resources/ScpDataMovementResource.java | 308 ++
...shJobSubmissionAppCatalogResourceAppCat.java | 332 ++
.../resources/SshJobSubmissionResource.java | 332 ++
...oreDataMovementAppCatalogResourceAppCat.java | 255 ++
.../resources/UnicoreDataMovementResource.java | 255 ++
...reJobSubmissionAppCatalogResourceAppCat.java | 328 ++
.../resources/UnicoreJobSubmissionResource.java | 328 ++
.../WorkflowAppCatalogResourceAppCat.java | 382 +++
.../WorkflowInputAppCatalogResourceAppCat.java | 451 +++
.../resources/WorkflowInputResource.java | 451 +++
.../WorkflowOutputAppCatalogResourceAppCat.java | 410 +++
.../resources/WorkflowOutputResource.java | 410 +++
.../app/catalog/resources/WorkflowResource.java | 382 +++
.../app/catalog/util/AppCatalogJPAUtils.java | 912 ++++++
.../catalog/util/AppCatalogQueryGenerator.java | 90 +
.../catalog/util/AppCatalogResourceType.java | 66 +
.../util/AppCatalogThriftConversion.java | 800 +++++
.../core/app/catalog/util/AppCatalogUtils.java | 31 +
.../experiment/catalog/ExpCatResourceUtils.java | 526 +++
.../catalog/ExperimentCatResource.java | 71 +
.../core/experiment/catalog/JPAConstants.java | 32 +
.../core/experiment/catalog/ResourceType.java | 49 +
.../catalog/impl/ExperimentCatalogImpl.java | 735 +++++
.../catalog/impl/ExperimentRegistry.java | 2983 ++++++++++++++++++
.../catalog/impl/GatewayRegistry.java | 115 +
.../impl/LoggingExperimentCatalogImpl.java | 97 +
.../catalog/impl/ProjectRegistry.java | 303 ++
.../catalog/impl/RegistryFactory.java | 80 +
.../core/experiment/catalog/impl/UserReg.java | 41 +
.../model/AdvancedInputDataHandling.java | 113 +
.../model/AdvancedOutputDataHandling.java | 105 +
.../catalog/model/ApplicationInput.java | 167 +
.../catalog/model/ApplicationInput_PK.java | 65 +
.../catalog/model/ApplicationOutput.java | 143 +
.../catalog/model/ApplicationOutput_PK.java | 64 +
.../Computational_Resource_Scheduling.java | 175 +
.../experiment/catalog/model/Configuration.java | 80 +
.../catalog/model/Configuration_PK.java | 74 +
.../catalog/model/DataTransferDetail.java | 93 +
.../experiment/catalog/model/ErrorDetail.java | 179 ++
.../experiment/catalog/model/Experiment.java | 299 ++
.../catalog/model/ExperimentConfigData.java | 142 +
.../catalog/model/Experiment_Input.java | 170 +
.../catalog/model/Experiment_Input_PK.java | 64 +
.../catalog/model/Experiment_Output.java | 143 +
.../catalog/model/Experiment_Output_PK.java | 64 +
.../core/experiment/catalog/model/Gateway.java | 76 +
.../catalog/model/Gateway_Worker.java | 82 +
.../catalog/model/Gateway_Worker_PK.java | 64 +
.../experiment/catalog/model/JobDetail.java | 135 +
.../experiment/catalog/model/JobDetails_PK.java | 64 +
.../experiment/catalog/model/NodeInput.java | 163 +
.../experiment/catalog/model/NodeInput_PK.java | 64 +
.../experiment/catalog/model/NodeOutput.java | 140 +
.../experiment/catalog/model/NodeOutput_PK.java | 64 +
.../catalog/model/Notification_Email.java | 81 +
.../core/experiment/catalog/model/Project.java | 125 +
.../experiment/catalog/model/ProjectUser.java | 81 +
.../catalog/model/ProjectUser_PK.java | 64 +
.../core/experiment/catalog/model/QosParam.java | 103 +
.../core/experiment/catalog/model/Status.java | 146 +
.../experiment/catalog/model/TaskDetail.java | 221 ++
.../core/experiment/catalog/model/Users.java | 55 +
.../catalog/model/WorkflowNodeDetail.java | 155 +
.../AbstractExperimentCatResource.java | 317 ++
...eInputDataHandlingExperimentCatResource.java | 160 +
...OutputDataHandlingExperimentCatResource.java | 150 +
.../ApplicationInputExperimentCatResource.java | 230 ++
.../ApplicationOutputExperimentCatResource.java | 208 ++
...putationSchedulingExperimentCatResource.java | 221 ++
.../ConfigDataExperimentCatResource.java | 194 ++
.../ConfigurationExperimentCatResource.java | 204 ++
...DataTransferDetailExperimentCatResource.java | 276 ++
.../ErrorDetailExperimentCatResource.java | 215 ++
.../ExperimentExperimentCatResource.java | 831 +++++
.../ExperimentInputExperimentCatResource.java | 225 ++
.../ExperimentOutputExperimentCatResource.java | 204 ++
.../ExperimentSummaryExperimentCatResource.java | 134 +
.../resources/GatewayExperimentCatResource.java | 437 +++
.../JobDetailExperimentCatResource.java | 376 +++
.../NodeInputExperimentCatResource.java | 227 ++
.../NodeOutputExperimentCatResource.java | 207 ++
.../NotificationEmailExperimentCatResource.java | 119 +
.../resources/ProjectExperimentCatResource.java | 508 +++
.../ProjectUserExperimentCatResource.java | 123 +
.../QosParamExperimentCatResource.java | 144 +
.../resources/StatusExperimentCatResource.java | 181 ++
.../TaskDetailExperimentCatResource.java | 748 +++++
.../resources/UserExperimentCatResource.java | 186 ++
.../experiment/catalog/resources/Utils.java | 1011 ++++++
.../resources/WorkerExperimentCatResource.java | 725 +++++
...WorkflowNodeDetailExperimentCatResource.java | 515 +++
.../catalog/utils/QueryGenerator.java | 128 +
.../utils/ThriftDataModelConversion.java | 686 ++++
.../core/experimet/catalog/JPAConstants.java | 33 +
.../core/experimet/catalog/Resource.java | 71 +
.../core/experimet/catalog/ResourceType.java | 50 +
.../core/experimet/catalog/ResourceUtils.java | 525 +++
.../catalog/impl/ExperimentCatalogImpl.java | 735 +++++
.../catalog/impl/ExperimentRegistry.java | 2983 ++++++++++++++++++
.../experimet/catalog/impl/GatewayRegistry.java | 115 +
.../impl/LoggingExperimentCatalogImpl.java | 97 +
.../experimet/catalog/impl/ProjectRegistry.java | 303 ++
.../experimet/catalog/impl/RegistryFactory.java | 80 +
.../core/experimet/catalog/impl/UserReg.java | 41 +
.../model/AdvancedInputDataHandling.java | 113 +
.../model/AdvancedOutputDataHandling.java | 104 +
.../catalog/model/ApplicationInput.java | 165 +
.../catalog/model/ApplicationInput_PK.java | 65 +
.../catalog/model/ApplicationOutput.java | 142 +
.../catalog/model/ApplicationOutput_PK.java | 64 +
.../Computational_Resource_Scheduling.java | 174 +
.../experimet/catalog/model/Configuration.java | 80 +
.../catalog/model/Configuration_PK.java | 74 +
.../catalog/model/DataTransferDetail.java | 91 +
.../experimet/catalog/model/ErrorDetail.java | 176 ++
.../experimet/catalog/model/Experiment.java | 299 ++
.../catalog/model/ExperimentConfigData.java | 142 +
.../catalog/model/Experiment_Input.java | 170 +
.../catalog/model/Experiment_Input_PK.java | 64 +
.../catalog/model/Experiment_Output.java | 143 +
.../catalog/model/Experiment_Output_PK.java | 64 +
.../core/experimet/catalog/model/Gateway.java | 76 +
.../experimet/catalog/model/Gateway_Worker.java | 82 +
.../catalog/model/Gateway_Worker_PK.java | 64 +
.../core/experimet/catalog/model/JobDetail.java | 135 +
.../experimet/catalog/model/JobDetails_PK.java | 64 +
.../core/experimet/catalog/model/NodeInput.java | 163 +
.../experimet/catalog/model/NodeInput_PK.java | 64 +
.../experimet/catalog/model/NodeOutput.java | 140 +
.../experimet/catalog/model/NodeOutput_PK.java | 64 +
.../catalog/model/Notification_Email.java | 81 +
.../core/experimet/catalog/model/Project.java | 125 +
.../experimet/catalog/model/ProjectUser.java | 81 +
.../experimet/catalog/model/ProjectUser_PK.java | 64 +
.../core/experimet/catalog/model/QosParam.java | 103 +
.../core/experimet/catalog/model/Status.java | 146 +
.../experimet/catalog/model/TaskDetail.java | 221 ++
.../core/experimet/catalog/model/Users.java | 55 +
.../catalog/model/WorkflowNodeDetail.java | 155 +
.../catalog/resources/AbstractResource.java | 317 ++
.../AdvanceInputDataHandlingResource.java | 160 +
.../AdvancedOutputDataHandlingResource.java | 150 +
.../resources/ApplicationInputResource.java | 230 ++
.../resources/ApplicationOutputResource.java | 208 ++
.../ComputationSchedulingResource.java | 221 ++
.../catalog/resources/ConfigDataResource.java | 194 ++
.../resources/ConfigurationResource.java | 204 ++
.../resources/DataTransferDetailResource.java | 276 ++
.../catalog/resources/ErrorDetailResource.java | 215 ++
.../resources/ExperimentInputResource.java | 225 ++
.../resources/ExperimentOutputResource.java | 204 ++
.../catalog/resources/ExperimentResource.java | 831 +++++
.../resources/ExperimentSummaryResource.java | 134 +
.../catalog/resources/GatewayResource.java | 437 +++
.../catalog/resources/JobDetailResource.java | 376 +++
.../catalog/resources/NodeInputResource.java | 227 ++
.../catalog/resources/NodeOutputResource.java | 207 ++
.../resources/NotificationEmailResource.java | 119 +
.../catalog/resources/ProjectResource.java | 508 +++
.../catalog/resources/ProjectUserResource.java | 123 +
.../catalog/resources/QosParamResource.java | 144 +
.../catalog/resources/StatusResource.java | 181 ++
.../catalog/resources/TaskDetailResource.java | 748 +++++
.../catalog/resources/UserResource.java | 186 ++
.../core/experimet/catalog/resources/Utils.java | 1011 ++++++
.../catalog/resources/WorkerResource.java | 725 +++++
.../resources/WorkflowNodeDetailResource.java | 515 +++
.../experimet/catalog/utils/QueryGenerator.java | 128 +
.../utils/ThriftDataModelConversion.java | 686 ++++
.../src/main/resources/META-INF/app-catalog.xml | 67 +
.../resources/META-INF/experiment-catalog.xml | 65 +
.../src/main/resources/META-INF/persistence.xml | 96 +
.../src/main/resources/appcatalog-derby.sql | 460 +++
.../src/main/resources/appcatalog-mysql.sql | 453 +++
.../src/main/resources/expcatalog-derby.sql | 391 +++
.../src/main/resources/expcatalog-mysql.sql | 392 +++
.../airavata/app/catalog/AppDeploymentTest.java | 146 +
.../airavata/app/catalog/AppInterfaceTest.java | 191 ++
...puteAppCatalogExperimentCatResourceTest.java | 297 ++
.../app/catalog/ComputeResourceTest.java | 297 ++
.../app/catalog/GatewayProfileTest.java | 127 +
.../airavata/app/catalog/util/Initialize.java | 320 ++
.../catalog/AbstractResourceTest.java | 91 +
.../catalog/ComputationalSchedulingTest.java | 85 +
.../ConfigurationExperimentCatResourceTest.java | 58 +
.../catalog/ConfigurationResourceTest.java | 58 +
.../catalog/ExecutionErrorResourceTest.java | 95 +
.../catalog/ExperimentCatalogUseCaseTest.java | 296 ++
.../catalog/ExperimentDataResourceTest.java | 107 +
.../ExperimentExperimentCatResourceTest.java | 78 +
...xperimentInputExperimentCatResourceTest.java | 77 +
.../catalog/ExperimentInputResourceTest.java | 75 +
.../catalog/ExperimentMetadataResourceTest.java | 87 +
...perimentOutputExperimentCatResourceTest.java | 77 +
.../catalog/ExperimentOutputResourceTest.java | 76 +
.../catalog/ExperimentResourceTest.java | 77 +
.../catalog/GFacJobDataResourceTest.java | 77 +
.../catalog/GFacJobStatusResourceTest.java | 87 +
.../GatewayExperimentCatResourceTest.java | 122 +
.../experiment/catalog/GatewayResourceTest.java | 120 +
.../catalog/GramDataResourceTest.java | 72 +
.../catalog/NodeDataResourceTest.java | 72 +
.../catalog/OrchestratorDataResourceTest.java | 69 +
.../TaskDetailExperimentCatResourceTest.java | 94 +
.../catalog/TaskDetailResourceTest.java | 93 +
.../catalog/UserExperimentCatResourceTest.java | 55 +
.../experiment/catalog/UserResourceTest.java | 54 +
.../experiment/catalog/WorkerResourceTest.java | 122 +
.../catalog/WorkflowDataResourceTest.java | 106 +
...flowNodeDetailExperimentCatResourceTest.java | 86 +
.../catalog/WorkflowNodeDetailResourceTest.java | 85 +
.../experiment/catalog/util/Initialize.java | 329 ++
.../src/test/resources/appcatalog-derby.sql | 460 +++
.../src/test/resources/expcatalog-derby.sql | 391 +++
modules/registry/registry-cpi/pom.xml | 5 +
.../airavata/registry/cpi/AppCatalog.java | 54 +
.../registry/cpi/AppCatalogException.java | 36 +
.../registry/cpi/ApplicationDeployment.java | 72 +
.../registry/cpi/ApplicationInterface.java | 148 +
.../airavata/registry/cpi/ChildDataType.java | 45 -
.../airavata/registry/cpi/ComputeResource.java | 249 ++
.../registry/cpi/ExpCatChildDataType.java | 45 +
.../registry/cpi/ExpCatParentDataType.java | 32 +
.../registry/cpi/ExperimentCatalog.java | 193 ++
.../cpi/ExperimentCatalogException.java | 38 +
.../cpi/ExperimentCatalogModelType.java | 51 +
.../registry/cpi/GwyResourceProfile.java | 81 +
.../airavata/registry/cpi/ParentDataType.java | 32 -
.../apache/airavata/registry/cpi/Registry.java | 178 +-
.../registry/cpi/RegistryModelType.java | 51 -
.../airavata/registry/cpi/WorkflowCatalog.java | 45 +
.../catalog/WorkflowCatalogFactory.java | 4 +-
.../workflow/engine/WorkflowEngineImpl.java | 10 +-
.../airavata/workflow/engine/WorkflowUtils.java | 4 +-
.../engine/interpretor/WorkflowInterpreter.java | 32 +-
pom.xml | 1 -
671 files changed, 84330 insertions(+), 50263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec8c6202/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 7953c1a..de29085 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -21,7 +21,6 @@
package org.apache.airavata.api.server.handler;
-import org.airavata.appcatalog.cpi.*;
import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
import org.apache.aiaravata.application.catalog.data.resources.*;
import org.apache.aiaravata.application.catalog.data.util.AppCatalogThriftConversion;
@@ -56,8 +55,8 @@ import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.orchestrator.client.OrchestratorClientFactory;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
import org.apache.airavata.orchestrator.cpi.OrchestratorService.Client;
-import org.apache.airavata.experiment.catalog.ResourceUtils;
-import org.apache.airavata.experiment.catalog.impl.RegistryFactory;
+import org.apache.airavata.registry.core.experiment.catalog.ResourceUtils;
+import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.utils.Constants;
import org.apache.thrift.TException;
@@ -69,7 +68,7 @@ import java.util.Map;
public class AiravataServerHandler implements Airavata.Iface {
private static final AiravataLogger logger = AiravataLoggerFactory.getLogger(AiravataServerHandler.class);
- private Registry registry;
+ private ExperimentCatalog experimentCatalog;
private AppCatalog appCatalog;
private Publisher publisher;
private WorkflowCatalog workflowCatalog;
@@ -97,12 +96,12 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public String addGateway(Gateway gateway) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
if (!validateString(gateway.getGatewayId())){
logger.error("Gateway id cannot be empty...");
throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
}
- return (String)registry.add(ParentDataType.GATEWAY, gateway, gateway.getGatewayId());
+ return (String) experimentCatalog.add(ExpCatParentDataType.GATEWAY, gateway, gateway.getGatewayId());
} catch (RegistryException e) {
logger.error("Error while adding gateway", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -115,14 +114,14 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public void updateGateway(String gatewayId, Gateway updatedGateway) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getRegistry(gatewayId);
- if (!registry.isExist(RegistryModelType.GATEWAY, gatewayId)){
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.GATEWAY, gatewayId)){
logger.error("Gateway does not exist in the system. Please provide a valid gateway ID...");
AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Gateway does not exist in the system. Please provide a valid gateway ID...");
throw exception;
}
- registry.update(RegistryModelType.GATEWAY, updatedGateway, gatewayId);
+ experimentCatalog.update(ExperimentCatalogModelType.GATEWAY, updatedGateway, gatewayId);
} catch (RegistryException e) {
logger.error("Error while updating the gateway", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -135,14 +134,14 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public Gateway getGateway(String gatewayId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getRegistry(gatewayId);
- if (!registry.isExist(RegistryModelType.GATEWAY, gatewayId)){
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.GATEWAY, gatewayId)){
logger.error("Gateway does not exist in the system. Please provide a valid gateway ID...");
AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Gateway does not exist in the system. Please provide a valid gateway ID...");
throw exception;
}
- return (Gateway)registry.get(RegistryModelType.GATEWAY, gatewayId);
+ return (Gateway) experimentCatalog.get(ExperimentCatalogModelType.GATEWAY, gatewayId);
} catch (RegistryException e) {
logger.error("Error while getting the gateway", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -155,14 +154,14 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public boolean deleteGateway(String gatewayId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getRegistry(gatewayId);
- if (!registry.isExist(RegistryModelType.GATEWAY, gatewayId)){
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.GATEWAY, gatewayId)){
logger.error("Gateway does not exist in the system. Please provide a valid gateway ID...");
AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Gateway does not exist in the system. Please provide a valid gateway ID...");
throw exception;
}
- registry.remove(RegistryModelType.GATEWAY, gatewayId);
+ experimentCatalog.remove(ExperimentCatalogModelType.GATEWAY, gatewayId);
return true;
} catch (RegistryException e) {
logger.error("Error while deleting the gateway", e);
@@ -177,8 +176,8 @@ public class AiravataServerHandler implements Airavata.Iface {
public List<Gateway> getAllGateways() throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
List<Gateway> gateways = new ArrayList<Gateway>();
- registry = RegistryFactory.getDefaultRegistry();
- List<Object> list = registry.get(RegistryModelType.GATEWAY, null, null);
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ List<Object> list = experimentCatalog.get(ExperimentCatalogModelType.GATEWAY, null, null);
for (Object gateway : list){
gateways.add((Gateway)gateway);
}
@@ -195,8 +194,8 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public boolean isGatewayExist(String gatewayId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getRegistry(gatewayId);
- return registry.isExist(RegistryModelType.GATEWAY, gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
+ return experimentCatalog.isExist(ExperimentCatalogModelType.GATEWAY, gatewayId);
} catch (RegistryException e) {
logger.error("Error while getting gateway", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -229,7 +228,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public String createProject(String gatewayId, Project project) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
if (!validateString(project.getName()) || !validateString(project.getOwner())){
logger.error("Project name and owner cannot be empty...");
throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
@@ -242,7 +241,7 @@ public class AiravataServerHandler implements Airavata.Iface {
logger.error("Gateway does not exist.Please provide a valid gateway id...");
throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
}
- return (String)registry.add(ParentDataType.PROJECT, project, gatewayId);
+ return (String) experimentCatalog.add(ExpCatParentDataType.PROJECT, project, gatewayId);
} catch (RegistryException e) {
logger.error("Error while creating the project", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -265,14 +264,14 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.PROJECT, projectId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.PROJECT, projectId)){
logger.error("Project does not exist in the system. Please provide a valid project ID...");
ProjectNotFoundException exception = new ProjectNotFoundException();
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
- registry.update(RegistryModelType.PROJECT, updatedProject, projectId);
+ experimentCatalog.update(ExperimentCatalogModelType.PROJECT, updatedProject, projectId);
} catch (RegistryException e) {
logger.error("Error while updating the project", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -303,14 +302,14 @@ public class AiravataServerHandler implements Airavata.Iface {
ProjectNotFoundException,
TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.PROJECT, projectId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.PROJECT, projectId)){
logger.error("Project does not exist in the system. Please provide a valid project ID...");
ProjectNotFoundException exception = new ProjectNotFoundException();
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
- return (Project)registry.get(RegistryModelType.PROJECT, projectId);
+ return (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, projectId);
} catch (RegistryException e) {
logger.error("Error while retrieving the project", e);
ProjectNotFoundException exception = new ProjectNotFoundException();
@@ -370,11 +369,11 @@ public class AiravataServerHandler implements Airavata.Iface {
exception.setMessage("User does not exist in the system. Please provide a valid user..");
throw exception;
}
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
filters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
- List<Object> list = registry.search(RegistryModelType.PROJECT, filters, limit, offset,
+ List<Object> list = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, filters, limit, offset,
Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
if (list != null && !list.isEmpty()){
for (Object o : list){
@@ -448,12 +447,12 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<Project> projects = new ArrayList<Project>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
filters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
filters.put(Constants.FieldConstants.ProjectConstants.PROJECT_NAME, projectName);
- List<Object> results = registry.search(RegistryModelType.PROJECT, filters, limit, offset,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, filters, limit, offset,
Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
projects.add((Project)object);
@@ -524,12 +523,12 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<Project> projects = new ArrayList<Project>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
filters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
filters.put(Constants.FieldConstants.ProjectConstants.DESCRIPTION, description);
- List<Object> results = registry.search(RegistryModelType.PROJECT, filters, limit, offset,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, filters, limit, offset,
Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
projects.add((Project)object);
@@ -603,12 +602,12 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<ExperimentSummary> summaries = new ArrayList<ExperimentSummary>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId);
filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME, expName);
- List<Object> results = registry.search(RegistryModelType.EXPERIMENT, filters, limit,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummary) object);
@@ -681,12 +680,12 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<ExperimentSummary> summaries = new ArrayList<ExperimentSummary>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId);
filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_DESC, description);
- List<Object> results = registry.search(RegistryModelType.EXPERIMENT, filters, limit,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummary) object);
@@ -756,12 +755,12 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<ExperimentSummary> summaries = new ArrayList<ExperimentSummary>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
filters.put(Constants.FieldConstants.ExperimentConstants.APPLICATION_ID, applicationId);
filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId);
- List<Object> results = registry.search(RegistryModelType.EXPERIMENT, filters, limit,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummary) object);
@@ -831,12 +830,12 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<ExperimentSummary> summaries = new ArrayList<ExperimentSummary>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS, experimentState.toString());
filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId);
- List<Object> results = registry.search(RegistryModelType.EXPERIMENT, filters, limit,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummary) object);
@@ -910,13 +909,13 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<ExperimentSummary> summaries = new ArrayList<ExperimentSummary>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> filters = new HashMap<String, String>();
filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
filters.put(Constants.FieldConstants.ExperimentConstants.FROM_DATE, String.valueOf(fromTime));
filters.put(Constants.FieldConstants.ExperimentConstants.TO_DATE, String.valueOf(toTime));
filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId);
- List<Object> results = registry.search(RegistryModelType.EXPERIMENT, filters, limit,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummary) object);
@@ -969,7 +968,7 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<ExperimentSummary> summaries = new ArrayList<ExperimentSummary>();
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
Map<String, String> regFilters = new HashMap();
regFilters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
regFilters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId);
@@ -989,7 +988,7 @@ public class AiravataServerHandler implements Airavata.Iface {
regFilters.put(Constants.FieldConstants.ExperimentConstants.TO_DATE, entry.getValue());
}
}
- List<Object> results = registry.search(RegistryModelType.EXPERIMENT, regFilters, limit,
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, regFilters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummary) object);
@@ -1044,15 +1043,15 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.PROJECT, projectId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.PROJECT, projectId)){
logger.error("Project does not exist in the system. Please provide a valid project ID...");
ProjectNotFoundException exception = new ProjectNotFoundException();
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
List<Experiment> experiments = new ArrayList<Experiment>();
- List<Object> list = registry.get(RegistryModelType.EXPERIMENT,
+ List<Object> list = experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT,
Constants.FieldConstants.ExperimentConstants.PROJECT_ID, projectId, limit, offset,
Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
if (list != null && !list.isEmpty()) {
@@ -1121,8 +1120,8 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
List<Experiment> experiments = new ArrayList<Experiment>();
- registry = RegistryFactory.getRegistry(gatewayId);
- List<Object> list = registry.get(RegistryModelType.EXPERIMENT,
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
+ List<Object> list = experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT,
Constants.FieldConstants.ExperimentConstants.USER_NAME, userName, limit, offset,
Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
if (list != null && !list.isEmpty()){
@@ -1165,7 +1164,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public String createExperiment(String gatewayId, Experiment experiment) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getRegistry(gatewayId);
+ experimentCatalog = RegistryFactory.getRegistry(gatewayId);
if (!validateString(experiment.getName())){
logger.error("Cannot create experiments with empty experiment name");
AiravataSystemException exception = new AiravataSystemException();
@@ -1177,7 +1176,7 @@ public class AiravataServerHandler implements Airavata.Iface {
logger.error("Gateway does not exist.Please provide a valid gateway id...");
throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
}
- String experimentId = (String) registry.add(ParentDataType.EXPERIMENT, experiment, gatewayId);
+ String experimentId = (String) experimentCatalog.add(ExpCatParentDataType.EXPERIMENT, experiment, gatewayId);
ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.CREATED,
experimentId,
gatewayId);
@@ -1223,11 +1222,11 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public Experiment getExperiment(String airavataExperimentId) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
- return (Experiment)registry.get(RegistryModelType.EXPERIMENT, airavataExperimentId);
+ return (Experiment) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId);
} catch (Exception e) {
logger.error("Error while retrieving the experiment", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -1265,8 +1264,8 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public void updateExperiment(String airavataExperimentId, Experiment experiment) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)) {
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)) {
logger.errorId(airavataExperimentId, "Update request failed, Experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
@@ -1275,7 +1274,7 @@ public class AiravataServerHandler implements Airavata.Iface {
ExperimentState experimentState = experimentStatus.getExperimentState();
switch (experimentState){
case CREATED: case VALIDATED:case UNKNOWN:
- registry.update(RegistryModelType.EXPERIMENT, experiment, airavataExperimentId);
+ experimentCatalog.update(ExperimentCatalogModelType.EXPERIMENT, experiment, airavataExperimentId);
logger.infoId(airavataExperimentId, "Successfully updated experiment {} ", experiment.getName());
break;
default:
@@ -1302,8 +1301,8 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public void updateExperimentConfiguration(String airavataExperimentId, UserConfigurationData userConfiguration) throws TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
logger.errorId(airavataExperimentId, "Update experiment configuration failed, experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
@@ -1312,7 +1311,7 @@ public class AiravataServerHandler implements Airavata.Iface {
ExperimentState experimentState = experimentStatus.getExperimentState();
switch (experimentState){
case CREATED: case VALIDATED: case CANCELED: case FAILED: case UNKNOWN:
- registry.add(ChildDataType.EXPERIMENT_CONFIGURATION_DATA, userConfiguration, airavataExperimentId);
+ experimentCatalog.add(ExpCatChildDataType.EXPERIMENT_CONFIGURATION_DATA, userConfiguration, airavataExperimentId);
logger.infoId(airavataExperimentId, "Successfully updated experiment configuration for experiment {}.", airavataExperimentId);
break;
default:
@@ -1342,8 +1341,8 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public void updateResourceScheduleing(String airavataExperimentId, ComputationalResourceScheduling resourceScheduling) throws TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
logger.infoId(airavataExperimentId, "Update resource scheduling failed, experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
@@ -1352,7 +1351,7 @@ public class AiravataServerHandler implements Airavata.Iface {
ExperimentState experimentState = experimentStatus.getExperimentState();
switch (experimentState){
case CREATED: case VALIDATED: case CANCELED: case FAILED: case UNKNOWN:
- registry.add(ChildDataType.COMPUTATIONAL_RESOURCE_SCHEDULING, resourceScheduling, airavataExperimentId);
+ experimentCatalog.add(ExpCatChildDataType.COMPUTATIONAL_RESOURCE_SCHEDULING, resourceScheduling, airavataExperimentId);
logger.infoId(airavataExperimentId, "Successfully updated resource scheduling for the experiment {}.", airavataExperimentId);
break;
default:
@@ -1393,8 +1392,8 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public boolean validateExperiment(String airavataExperimentId) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)) {
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)) {
logger.errorId(airavataExperimentId, "Experiment validation failed , experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
@@ -1453,13 +1452,13 @@ public class AiravataServerHandler implements Airavata.Iface {
AiravataSystemException,
TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
logger.errorId(airavataExperimentId, "Error while retrieving experiment status, experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId +
" does not exist in the system..");
}
- return (ExperimentStatus)registry.get(RegistryModelType.EXPERIMENT_STATUS, airavataExperimentId);
+ return (ExperimentStatus) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT_STATUS, airavataExperimentId);
} catch (Exception e) {
logger.errorId(airavataExperimentId, "Error while retrieving the experiment status", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -1472,12 +1471,12 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public List<OutputDataObjectType> getExperimentOutputs(String airavataExperimentId) throws TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
logger.errorId(airavataExperimentId, "Get experiment outputs failed, experiment {} doesn't exit.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
- return (List<OutputDataObjectType>)registry.get(RegistryModelType.EXPERIMENT_OUTPUT, airavataExperimentId);
+ return (List<OutputDataObjectType>) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT_OUTPUT, airavataExperimentId);
} catch (Exception e) {
logger.errorId(airavataExperimentId, "Error while retrieving the experiment outputs", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -1495,20 +1494,20 @@ public class AiravataServerHandler implements Airavata.Iface {
public Map<String, JobStatus> getJobStatuses(String airavataExperimentId) throws TException {
Map<String, JobStatus> jobStatus = new HashMap<String, JobStatus>();
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
logger.errorId(airavataExperimentId, "Error while retrieving job status, the experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
- List<Object> workflowNodes = registry.get(RegistryModelType.WORKFLOW_NODE_DETAIL, Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID, airavataExperimentId);
+ List<Object> workflowNodes = experimentCatalog.get(ExperimentCatalogModelType.WORKFLOW_NODE_DETAIL, Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID, airavataExperimentId);
if (workflowNodes != null && !workflowNodes.isEmpty()){
for (Object wf : workflowNodes){
String nodeInstanceId = ((WorkflowNodeDetails) wf).getNodeInstanceId();
- List<Object> taskDetails = registry.get(RegistryModelType.TASK_DETAIL, Constants.FieldConstants.TaskDetailConstants.NODE_ID, nodeInstanceId);
+ List<Object> taskDetails = experimentCatalog.get(ExperimentCatalogModelType.TASK_DETAIL, Constants.FieldConstants.TaskDetailConstants.NODE_ID, nodeInstanceId);
if (taskDetails != null && !taskDetails.isEmpty()){
for (Object ts : taskDetails){
String taskID = ((TaskDetails) ts).getTaskID();
- List<Object> jobDetails = registry.get(RegistryModelType.JOB_DETAIL, Constants.FieldConstants.JobDetaisConstants.TASK_ID, taskID);
+ List<Object> jobDetails = experimentCatalog.get(ExperimentCatalogModelType.JOB_DETAIL, Constants.FieldConstants.JobDetaisConstants.TASK_ID, taskID);
if (jobDetails != null && !jobDetails.isEmpty()){
for (Object job : jobDetails){
String jobID = ((JobDetails) job).getJobID();
@@ -1533,20 +1532,20 @@ public class AiravataServerHandler implements Airavata.Iface {
public List<JobDetails> getJobDetails(String airavataExperimentId) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
List<JobDetails> jobDetailsList = new ArrayList<JobDetails>();
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)){
logger.errorId(airavataExperimentId, "Error while retrieving job details, experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
- List<Object> workflowNodes = registry.get(RegistryModelType.WORKFLOW_NODE_DETAIL, Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID, airavataExperimentId);
+ List<Object> workflowNodes = experimentCatalog.get(ExperimentCatalogModelType.WORKFLOW_NODE_DETAIL, Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID, airavataExperimentId);
if (workflowNodes != null && !workflowNodes.isEmpty()){
for (Object wf : workflowNodes){
String nodeInstanceId = ((WorkflowNodeDetails) wf).getNodeInstanceId();
- List<Object> taskDetails = registry.get(RegistryModelType.TASK_DETAIL, Constants.FieldConstants.TaskDetailConstants.NODE_ID, nodeInstanceId);
+ List<Object> taskDetails = experimentCatalog.get(ExperimentCatalogModelType.TASK_DETAIL, Constants.FieldConstants.TaskDetailConstants.NODE_ID, nodeInstanceId);
if (taskDetails != null && !taskDetails.isEmpty()){
for (Object ts : taskDetails){
String taskID = ((TaskDetails) ts).getTaskID();
- List<Object> jobDetails = registry.get(RegistryModelType.JOB_DETAIL, Constants.FieldConstants.JobDetaisConstants.TASK_ID, taskID);
+ List<Object> jobDetails = experimentCatalog.get(ExperimentCatalogModelType.JOB_DETAIL, Constants.FieldConstants.JobDetaisConstants.TASK_ID, taskID);
if (jobDetails != null && !jobDetails.isEmpty()){
for (Object job : jobDetails){
jobDetailsList.add((JobDetails) job);
@@ -1570,20 +1569,20 @@ public class AiravataServerHandler implements Airavata.Iface {
public List<DataTransferDetails> getDataTransferDetails(String airavataExperimentId) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
List<DataTransferDetails> dataTransferDetailList = new ArrayList<DataTransferDetails>();
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)) {
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)) {
logger.errorId(airavataExperimentId, "Error while retrieving data transfer details, experiment {} doesn't exit.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
- List<Object> workflowNodes = registry.get(RegistryModelType.WORKFLOW_NODE_DETAIL, Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID, airavataExperimentId);
+ List<Object> workflowNodes = experimentCatalog.get(ExperimentCatalogModelType.WORKFLOW_NODE_DETAIL, Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID, airavataExperimentId);
if (workflowNodes != null && !workflowNodes.isEmpty()){
for (Object wf : workflowNodes){
String nodeInstanceId = ((WorkflowNodeDetails) wf).getNodeInstanceId();
- List<Object> taskDetails = registry.get(RegistryModelType.TASK_DETAIL, Constants.FieldConstants.TaskDetailConstants.NODE_ID, nodeInstanceId);
+ List<Object> taskDetails = experimentCatalog.get(ExperimentCatalogModelType.TASK_DETAIL, Constants.FieldConstants.TaskDetailConstants.NODE_ID, nodeInstanceId);
if (taskDetails != null && !taskDetails.isEmpty()){
for (Object ts : taskDetails){
String taskID = ((TaskDetails) ts).getTaskID();
- List<Object> dataTransferDetails = registry.get(RegistryModelType.DATA_TRANSFER_DETAIL, Constants.FieldConstants.JobDetaisConstants.TASK_ID, taskID);
+ List<Object> dataTransferDetails = experimentCatalog.get(ExperimentCatalogModelType.DATA_TRANSFER_DETAIL, Constants.FieldConstants.JobDetaisConstants.TASK_ID, taskID);
if (dataTransferDetails != null && !dataTransferDetails.isEmpty()){
for (Object dataTransfer : dataTransferDetails){
dataTransferDetailList.add((DataTransferDetails) dataTransfer);
@@ -1641,8 +1640,8 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public void launchExperiment(final String airavataExperimentId, String airavataCredStoreToken) throws TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId)) {
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId)) {
logger.errorId(airavataExperimentId, "Error while launching experiment, experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
@@ -1718,13 +1717,13 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public String cloneExperiment(String existingExperimentID, String newExperiementName) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.EXPERIMENT, existingExperimentID)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, existingExperimentID)){
logger.errorId(existingExperimentID, "Error while cloning experiment {}, experiment doesn't exist.", existingExperimentID);
throw new ExperimentNotFoundException("Requested experiment id " + existingExperimentID + " does not exist in the system..");
}
- Experiment existingExperiment = (Experiment)registry.get(RegistryModelType.EXPERIMENT, existingExperimentID);
- String gatewayId = (String)registry.getValue(RegistryModelType.EXPERIMENT, existingExperimentID, Constants.FieldConstants.ExperimentConstants.GATEWAY);
+ Experiment existingExperiment = (Experiment) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, existingExperimentID);
+ String gatewayId = (String) experimentCatalog.getValue(ExperimentCatalogModelType.EXPERIMENT, existingExperimentID, Constants.FieldConstants.ExperimentConstants.GATEWAY);
existingExperiment.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime());
if (existingExperiment.getApplicationId() != null){
List<OutputDataObjectType> applicationOutputs = getApplicationOutputs(existingExperiment.getApplicationId());
@@ -1739,7 +1738,7 @@ public class AiravataServerHandler implements Airavata.Iface {
if (existingExperiment.getErrors() != null ){
existingExperiment.getErrors().clear();
}
- return (String)registry.add(ParentDataType.EXPERIMENT, existingExperiment, gatewayId);
+ return (String) experimentCatalog.add(ExpCatParentDataType.EXPERIMENT, existingExperiment, gatewayId);
} catch (Exception e) {
logger.errorId(existingExperimentID, "Error while cloning the experiment with existing configuration...", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -1773,7 +1772,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public void terminateExperiment(String airavataExperimentId, String tokenId) throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
try {
- if (!(registry.isExist(RegistryModelType.EXPERIMENT, airavataExperimentId))){
+ if (!(experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId))){
logger.error("Experiment does not exist.Please provide a valid experiment id...");
throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
}
@@ -3482,14 +3481,14 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
public boolean deleteProject(String projectId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException, TException {
try {
- registry = RegistryFactory.getDefaultRegistry();
- if (!registry.isExist(RegistryModelType.PROJECT, projectId)){
+ experimentCatalog = RegistryFactory.getDefaultRegistry();
+ if (!experimentCatalog.isExist(ExperimentCatalogModelType.PROJECT, projectId)){
logger.error("Project does not exist in the system. Please provide a valid project ID...");
ProjectNotFoundException exception = new ProjectNotFoundException();
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
- registry.remove(RegistryModelType.PROJECT, projectId);
+ experimentCatalog.remove(ExperimentCatalogModelType.PROJECT, projectId);
return true;
} catch (RegistryException e) {
logger.error("Error while removing the project", e);