adding registry changes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5a648a60 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5a648a60 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5a648a60 Branch: refs/heads/moduleRefactor Commit: 5a648a60fb8d6f736406fea001cc73c4d500b060 Parents: ec8c620 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 5 11:00:54 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 5 11:00:54 2015 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 2 +- .../server/handler/AiravataServerHandler.java | 4 +- .../client_samples/createExperiment.cpp | 4 +- .../resources/client_samples/createProject.cpp | 4 +- .../client_samples/getExperimentOutputs.cpp | 4 +- .../client_samples/getExperimentStatus.cpp | 4 +- .../client_samples/launchExperiment.cpp | 4 +- .../lib/apache/airavata/api/Airavata.py | 8 +- .../airavata-api/airavataAPI.thrift | 4 +- .../airavata-api/experimentModel.thrift | 2 +- .../main/resources/airavata-client.properties | 14 +- modules/gfac/gfac-core/pom.xml | 2 +- .../services/impl/BigRed2TestWithSSHAuth.java | 2 +- .../impl/GSISSHProviderTestWithMyProxyAuth.java | 2 +- .../gfac/services/impl/LocalProviderTest.java | 2 +- modules/gfac/gfac-service/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/orchestrator/orchestrator-core/pom.xml | 2 +- .../orchestrator/core/ValidatorTest.java | 2 +- .../app/catalog/model/DataMovementProtocol.java | 76 - .../catalog/model/DataMovementProtocolPK.java | 74 - .../catalog/model/JobSubmissionProtocol.java | 77 - .../catalog/model/JobSubmissionProtocolPK.java | 74 - .../app/catalog/resources/AbstractResource.java | 382 --- .../resources/AppDeploymentResource.java | 446 --- .../resources/AppEnvironmentResource.java | 293 -- .../catalog/resources/AppInterfaceResource.java | 363 --- .../resources/AppModuleMappingResource.java | 317 -- .../catalog/resources/AppModuleResource.java | 344 -- .../resources/ApplicationInputResource.java | 454 --- .../resources/ApplicationOutputResource.java | 432 --- .../catalog/resources/BatchQueueResource.java | 357 --- .../resources/CloudSubmissionResource.java | 298 -- .../ComputeHostPreferenceResource.java | 413 --- .../ComputeResourceFileSystemResource.java | 307 -- .../resources/ComputeResourceResource.java | 351 --- .../DataMovementInterfaceResource.java | 339 -- .../resources/DataMovementProtocolResource.java | 360 --- .../catalog/resources/GSISSHExportResource.java | 324 -- .../resources/GSISSHSubmissionResource.java | 373 --- .../resources/GatewayProfileResource.java | 318 -- .../resources/GlobusGKEndpointResource.java | 321 -- .../resources/GlobusJobSubmissionResource.java | 315 -- .../resources/GridftpDataMovementResource.java | 279 -- .../resources/GridftpEndpointResource.java | 317 -- .../catalog/resources/HostAliasResource.java | 317 -- .../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 -- .../resources/LocalSubmissionResource.java | 293 -- .../resources/ModuleLoadCmdResource.java | 300 -- .../resources/PostJobCommandResource.java | 333 -- .../resources/PreJobCommandResource.java | 333 -- .../core/app/catalog/resources/Resource.java | 89 - .../resources/ResourceJobManagerResource.java | 301 -- .../resources/ScpDataMovementResource.java | 308 -- .../resources/SshJobSubmissionResource.java | 332 -- .../resources/UnicoreDataMovementResource.java | 255 -- .../resources/UnicoreJobSubmissionResource.java | 328 -- .../resources/WorkflowInputResource.java | 451 --- .../resources/WorkflowOutputResource.java | 410 --- .../app/catalog/resources/WorkflowResource.java | 382 --- .../catalog/impl/ExperimentCatalogImpl.java | 2 +- .../catalog/impl/ExperimentRegistry.java | 2 +- .../catalog/impl/GatewayRegistry.java | 2 +- .../impl/LoggingExperimentCatalogImpl.java | 2 +- .../catalog/impl/ProjectRegistry.java | 2 +- .../catalog/impl/RegistryFactory.java | 2 +- .../core/experiment/catalog/impl/UserReg.java | 2 +- .../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 - .../src/main/resources/META-INF/persistence.xml | 29 - .../app/catalog/ComputeResourceTest.java | 297 -- .../catalog/AbstractResourceTest.java | 4 +- .../catalog/ComputationalSchedulingTest.java | 2 +- .../ConfigurationExperimentCatResourceTest.java | 2 +- .../catalog/ConfigurationResourceTest.java | 58 - .../catalog/ExecutionErrorResourceTest.java | 95 - .../catalog/ExperimentCatalogUseCaseTest.java | 6 +- .../catalog/ExperimentDataResourceTest.java | 107 - .../ExperimentExperimentCatResourceTest.java | 2 +- ...xperimentInputExperimentCatResourceTest.java | 2 +- .../catalog/ExperimentInputResourceTest.java | 75 - .../catalog/ExperimentMetadataResourceTest.java | 87 - ...perimentOutputExperimentCatResourceTest.java | 2 +- .../catalog/ExperimentOutputResourceTest.java | 76 - .../catalog/ExperimentResourceTest.java | 77 - .../catalog/GFacJobDataResourceTest.java | 77 - .../catalog/GFacJobStatusResourceTest.java | 87 - .../GatewayExperimentCatResourceTest.java | 2 +- .../experiment/catalog/GatewayResourceTest.java | 120 - .../catalog/GramDataResourceTest.java | 72 - .../catalog/NodeDataResourceTest.java | 72 - .../catalog/OrchestratorDataResourceTest.java | 69 - .../TaskDetailExperimentCatResourceTest.java | 2 +- .../catalog/TaskDetailResourceTest.java | 93 - .../catalog/UserExperimentCatResourceTest.java | 2 +- .../experiment/catalog/UserResourceTest.java | 54 - .../experiment/catalog/WorkerResourceTest.java | 122 - .../catalog/WorkflowDataResourceTest.java | 106 - ...flowNodeDetailExperimentCatResourceTest.java | 2 +- .../catalog/WorkflowNodeDetailResourceTest.java | 85 - .../experiment/catalog/util/Initialize.java | 2 +- modules/workflow-model/workflow-engine/pom.xml | 2 +- .../workflow/engine/WorkflowEngineImpl.java | 2 +- .../engine/interpretor/WorkflowInterpreter.java | 2 +- modules/workflow/workflow-core/pom.xml | 2 +- .../core/SimpleWorkflowInterpreter.java | 2 +- .../core/parser/AiravataWorkflowParser.java | 2 +- modules/xbaya-gui/pom.xml | 2 +- .../dialogs/registry/NewRegistryUserDialog.java | 10 +- samples/java-client/experiment/pom.xml | 2 +- 191 files changed, 70 insertions(+), 35522 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-api-server/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml index 64ca836..3f0537a 100644 --- a/airavata-api/airavata-api-server/pom.xml +++ b/airavata-api/airavata-api-server/pom.xml @@ -48,7 +48,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/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 de29085..940210a 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 @@ -1145,7 +1145,7 @@ public class AiravataServerHandler implements Airavata.Iface { * has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except * registering the experiment in a persistent store. * - * @param experiment@return The server-side generated airavata experiment globally unique identifier. + * @param experiment@return The server-side generated.airavata.registry.core.experiment.globally unique identifier. * @throws org.apache.airavata.model.error.InvalidRequestException For any incorrect forming of the request itself. * @throws org.apache.airavata.model.error.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve: * <p/> @@ -1685,7 +1685,7 @@ public class AiravataServerHandler implements Airavata.Iface { * experiment name that should be used in the cloned experiment * * @return - * The server-side generated airavata experiment globally unique identifier for the newly cloned experiment. + * The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment. * * @throws org.apache.airavata.model.error.InvalidRequestException * For any incorrect forming of the request itself. http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createExperiment.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createExperiment.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createExperiment.cpp index f4bff07..bf8c4d1 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createExperiment.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createExperiment.cpp @@ -37,8 +37,8 @@ #include "../lib/airavata/airavataDataModel_types.cpp" #include "../lib/airavata/airavataErrors_types.h" #include "../lib/airavata/airavataErrors_types.cpp" -#include "../lib/airavata/experimentModel_types.h" -#include "../lib/airavata/experimentModel_types.cpp" +#include "../lib.airavata.registry.core.experiment.odel_types.h" +#include "../lib.airavata.registry.core.experiment.odel_types.cpp" #include "../lib/airavata/workspaceModel_types.h" #include "../lib/airavata/workspaceModel_types.cpp" #include "../lib/airavata/airavataAPI_types.h" http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createProject.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createProject.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createProject.cpp index 348e9ce..da2d02c 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createProject.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/createProject.cpp @@ -37,8 +37,8 @@ #include "../lib/airavata/airavataDataModel_types.cpp" #include "../lib/airavata/airavataErrors_types.h" #include "../lib/airavata/airavataErrors_types.cpp" -#include "../lib/airavata/experimentModel_types.h" -#include "../lib/airavata/experimentModel_types.cpp" +#include "../lib.airavata.registry.core.experiment.odel_types.h" +#include "../lib.airavata.registry.core.experiment.odel_types.cpp" #include "../lib/airavata/workspaceModel_types.h" #include "../lib/airavata/workspaceModel_types.cpp" #include "../lib/airavata/airavataAPI_types.h" http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentOutputs.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentOutputs.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentOutputs.cpp index b3cb28e..a4b9797 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentOutputs.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentOutputs.cpp @@ -37,8 +37,8 @@ #include "../lib/airavata/airavataDataModel_types.cpp" #include "../lib/airavata/airavataErrors_types.h" #include "../lib/airavata/airavataErrors_types.cpp" -#include "../lib/airavata/experimentModel_types.h" -#include "../lib/airavata/experimentModel_types.cpp" +#include "../lib.airavata.registry.core.experiment.odel_types.h" +#include "../lib.airavata.registry.core.experiment.odel_types.cpp" #include "../lib/airavata/workspaceModel_types.h" #include "../lib/airavata/workspaceModel_types.cpp" #include "../lib/airavata/airavataAPI_types.h" http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentStatus.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentStatus.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentStatus.cpp index 36af323..f340734 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentStatus.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/getExperimentStatus.cpp @@ -37,8 +37,8 @@ #include "../lib/airavata/airavataDataModel_types.cpp" #include "../lib/airavata/airavataErrors_types.h" #include "../lib/airavata/airavataErrors_types.cpp" -#include "../lib/airavata/experimentModel_types.h" -#include "../lib/airavata/experimentModel_types.cpp" +#include "../lib.airavata.registry.core.experiment.odel_types.h" +#include "../lib.airavata.registry.core.experiment.odel_types.cpp" #include "../lib/airavata/workspaceModel_types.h" #include "../lib/airavata/workspaceModel_types.cpp" #include "../lib/airavata/airavataAPI_types.h" http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/launchExperiment.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/launchExperiment.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/launchExperiment.cpp index bf4ce7c..2dc95a6 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/launchExperiment.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client_samples/launchExperiment.cpp @@ -37,8 +37,8 @@ #include "../lib/airavata/airavataDataModel_types.cpp" #include "../lib/airavata/airavataErrors_types.h" #include "../lib/airavata/airavataErrors_types.cpp" -#include "../lib/airavata/experimentModel_types.h" -#include "../lib/airavata/experimentModel_types.cpp" +#include "../lib.airavata.registry.core.experiment.odel_types.h" +#include "../lib.airavata.registry.core.experiment.odel_types.cpp" #include "../lib/airavata/workspaceModel_types.h" #include "../lib/airavata/workspaceModel_types.cpp" #include "../lib/airavata/airavataAPI_types.h" http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py index 6a81820..cd0638c 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py @@ -619,7 +619,7 @@ class Iface: the ExperimentMetadata is a required field. @return - The server-side generated airavata experiment globally unique identifier. + The server-side generated.airavata.registry.core.experiment.globally unique identifier. @throws org.apache.airavata.model.error.InvalidRequestException For any incorrect forming of the request itself. @@ -870,7 +870,7 @@ class Iface: should be shared public by default. @return - The server-side generated airavata experiment globally unique identifier for the newly cloned experiment. + The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment. @throws org.apache.airavata.model.error.InvalidRequestException For any incorrect forming of the request itself. @@ -3832,7 +3832,7 @@ class Client(Iface): the ExperimentMetadata is a required field. @return - The server-side generated airavata experiment globally unique identifier. + The server-side generated.airavata.registry.core.experiment.globally unique identifier. @throws org.apache.airavata.model.error.InvalidRequestException For any incorrect forming of the request itself. @@ -4467,7 +4467,7 @@ class Client(Iface): should be shared public by default. @return - The server-side generated airavata experiment globally unique identifier for the newly cloned experiment. + The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment. @throws org.apache.airavata.model.error.InvalidRequestException For any incorrect forming of the request itself. http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/component-interface-descriptions/airavata-api/airavataAPI.thrift ---------------------------------------------------------------------- diff --git a/component-interface-descriptions/airavata-api/airavataAPI.thrift b/component-interface-descriptions/airavata-api/airavataAPI.thrift index 9251a56..699e96b 100644 --- a/component-interface-descriptions/airavata-api/airavataAPI.thrift +++ b/component-interface-descriptions/airavata-api/airavataAPI.thrift @@ -605,7 +605,7 @@ service Airavata { * the ExperimentMetadata is a required field. * * @return - * The server-side generated airavata experiment globally unique identifier. + * The server-side generated.airavata.registry.core.experiment.globally unique identifier. * * @throws org.apache.airavata.model.error.InvalidRequestException * For any incorrect forming of the request itself. @@ -842,7 +842,7 @@ service Airavata { * should be shared public by default. * * @return - * The server-side generated airavata experiment globally unique identifier for the newly cloned experiment. + * The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment. * * @throws org.apache.airavata.model.error.InvalidRequestException * For any incorrect forming of the request itself. http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/component-interface-descriptions/airavata-api/experimentModel.thrift ---------------------------------------------------------------------- diff --git a/component-interface-descriptions/airavata-api/experimentModel.thrift b/component-interface-descriptions/airavata-api/experimentModel.thrift index d0d50f9..7bc2dc7 100644 --- a/component-interface-descriptions/airavata-api/experimentModel.thrift +++ b/component-interface-descriptions/airavata-api/experimentModel.thrift @@ -27,7 +27,7 @@ namespace cpp apache.airavata.model.workspace.experiment namespace py apache.airavata.model.workspace.experiment /* - * This file describes the definitions of the Airavata Experiment Data Structures. Each of the + * This file describes the definitions of the.airavata.registry.core.experiment.Data Structures. Each of the * language specific Airavata Client SDK's will translate this neutral data model into an * appropriate form for passing to the Airavata Server Execution API Calls. * http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/configuration/client/src/main/resources/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties index 14d37c7..e8bb332 100644 --- a/modules/configuration/client/src/main/resources/airavata-client.properties +++ b/modules/configuration/client/src/main/resources/airavata-client.properties @@ -27,7 +27,7 @@ ###---------------------------REGISTRY API IMPLEMENTATION---------------------------### -#class.registry.accessor=org.apache.airavata.experimentregistry.impl.AiravataJPARegistry +#class.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.impl.AiravataJPARegistry #class.registry.accessor=org.apache.airavata.rest.client.RegistryClient ###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------### @@ -67,12 +67,12 @@ appcatalog.jdbc.password=airavata appcatalog.validationQuery=SELECT 1 from COMPUTE_RESOURCE #user defined registry accessor classes -#class.provenance.registry.accessor=org.apache.airavata.experimentregistry.jpa.impl.AiravataJPARegistry -#class.configuration.registry.accessor=org.apache.airavata.experimentregistry.jpa.impl.AiravataJPARegistry -#class.descriptor.registry.accessor=org.apache.airavata.experimentregistry.jpa.impl.AiravataJPARegistry -#class.project.registry.accessor=org.apache.airavata.experimentregistry.jpa.impl.AiravataJPARegistry -#class.user.workflow.registry.accessor=org.apache.airavata.experimentregistry.jpa.impl.AiravataJPARegistry -#class.published.workflow.registry.accessor=org.apache.airavata.experimentregistry.jpa.impl.AiravataJPARegistry +#class.provenance.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.registry.core.experiment.egistry.jpa.impl.AiravataJPARegistry ########################Registry Rest Implementation Settings######################## http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/gfac/gfac-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml index 079fe36..f1de99c 100644 --- a/modules/gfac/gfac-core/pom.xml +++ b/modules/gfac/gfac-core/pom.xml @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java index 38981aa..2c15c5e 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java @@ -42,7 +42,7 @@ //import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPublicKeyFileAuthentication; //import org.apache.airavata.gfac.ssh.util.CommonUtils; //import org.apache.airavata.model.workspace.experiment.TaskDetails; -//import org.apache.airavata.experiment.registry.jpa.impl.RegistryFactory; +//import org.apache.airavata.registry.core.experiment.registry.jpa.impl.RegistryFactory; //import org.apache.airavata.schemas.gfac.*; //import org.testng.annotations.BeforeClass; //import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java index 61db417..9b922dd 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java @@ -49,7 +49,7 @@ //import org.apache.airavata.gfac.ssh.util.CommonUtils; //import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; //import org.apache.airavata.model.workspace.experiment.TaskDetails; -//import org.apache.airavata.experiment.registry.jpa.impl.RegistryFactory; +//import org.apache.airavata.registry.core.experiment.registry.jpa.impl.RegistryFactory; //import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType; //import org.apache.airavata.schemas.gfac.GsisshHostType; //import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java index b3974d2..0ff53fd 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java @@ -42,7 +42,7 @@ //import org.apache.airavata.model.workspace.experiment.Experiment; //import org.apache.airavata.model.workspace.experiment.TaskDetails; //import org.apache.airavata.model.workspace.experiment.WorkflowNodeDetails; -//import org.apache.airavata.experiment.registry.jpa.impl.LoggingRegistryImpl; +//import org.apache.airavata.registry.core.experiment.registry.jpa.impl.LoggingRegistryImpl; //import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType; //import org.apache.airavata.schemas.gfac.InputParameterType; //import org.apache.airavata.schemas.gfac.OutputParameterType; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/gfac/gfac-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml index 83999e3..f3b794b 100644 --- a/modules/gfac/gfac-service/pom.xml +++ b/modules/gfac/gfac-service/pom.xml @@ -52,7 +52,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 7dc520a..b4700ec 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -182,7 +182,7 @@ <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/orchestrator/orchestrator-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index 43ae617..4882e58 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -36,7 +36,7 @@ the License. --> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java index 2b3e935..2ef4dc5 100644 --- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java +++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java @@ -27,7 +27,7 @@ //import org.apache.airavata.orchestrator.core.utils.OrchestratorConstants; //import org.apache.airavata.orchestrator.cpi.Orchestrator; //import org.apache.airavata.orchestrator.cpi.impl.SimpleOrchestratorImpl; -//import org.apache.airavata.experiment.registry.jpa.impl.RegistryFactory; +//import org.apache.airavata.registry.core.experiment.registry.jpa.impl.RegistryFactory; //import org.apache.airavata.registry.cpi.ParentDataType; //import org.apache.airavata.registry.cpi.Registry; //import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocol.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocol.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocol.java deleted file mode 100644 index d45c4e8..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocol.java +++ /dev/null @@ -1,76 +0,0 @@ -///* -// * -// * Licensed to the Apache Software Foundation (ASF) under one -// * or more contributor license agreements. See the NOTICE file -// * distributed with this work for additional information -// * regarding copyright ownership. The ASF licenses this file -// * to you under the Apache License, Version 2.0 (the -// * "License"); you may not use this file except in compliance -// * with the License. You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, -// * software distributed under the License is distributed on an -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// * KIND, either express or implied. See the License for the -// * specific language governing permissions and limitations -// * under the License. -// * -// */ -// -//package org.apache.aiaravata.application.catalog.data.model; -// -//import javax.persistence.*; -//import java.io.Serializable; -// -//@Entity -//@Table(name = "DATA_MOVEMENT_PROTOCOL") -//@IdClass(DataMovementProtocolPK.class) -//public class DataMovementProtocol implements Serializable { -// @Id -// @Column(name = "RESOURCE_ID") -// private String resourceID; -// @Id -// @Column(name = "DATA_MOVE_ID") -// private String dataMoveID; -// @Id -// @Column(name = "DATA_MOVE_TYPE") -// private String dataMoveType; -// -// @ManyToOne(cascade= CascadeType.MERGE) -// @JoinColumn(name = "RESOURCE_ID") -// private ComputeResource computeResource; -// -// public String getResourceID() { -// return resourceID; -// } -// -// public void setResourceID(String resourceID) { -// this.resourceID = resourceID; -// } -// -// public String getDataMoveID() { -// return dataMoveID; -// } -// -// public void setDataMoveID(String dataMoveID) { -// this.dataMoveID = dataMoveID; -// } -// -// public String getDataMoveType() { -// return dataMoveType; -// } -// -// public void setDataMoveType(String dataMoveType) { -// this.dataMoveType = dataMoveType; -// } -// -// public ComputeResource getComputeResource() { -// return computeResource; -// } -// -// public void setComputeResource(ComputeResource computeResource) { -// this.computeResource = computeResource; -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocolPK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocolPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocolPK.java deleted file mode 100644 index 9e53d1f..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataMovementProtocolPK.java +++ /dev/null @@ -1,74 +0,0 @@ -///* -// * -// * Licensed to the Apache Software Foundation (ASF) under one -// * or more contributor license agreements. See the NOTICE file -// * distributed with this work for additional information -// * regarding copyright ownership. The ASF licenses this file -// * to you under the Apache License, Version 2.0 (the -// * "License"); you may not use this file except in compliance -// * with the License. You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, -// * software distributed under the License is distributed on an -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// * KIND, either express or implied. See the License for the -// * specific language governing permissions and limitations -// * under the License. -// * -// */ -// -//package org.apache.aiaravata.application.catalog.data.model; -// -//import java.io.Serializable; -// -//public class DataMovementProtocolPK implements Serializable { -// private String resourceID; -// private String dataMoveID; -// private String dataMoveType; -// -// public DataMovementProtocolPK(String resourceID, String dataMoveID, String dataMoveType) { -// this.resourceID = resourceID; -// this.dataMoveID = dataMoveID; -// this.dataMoveType = dataMoveType; -// } -// -// public DataMovementProtocolPK() { -// ; -// } -// -// @Override -// public boolean equals(Object o) { -// return false; -// } -// -// @Override -// public int hashCode() { -// return 1; -// } -// -// public String getResourceID() { -// return resourceID; -// } -// -// public void setResourceID(String resourceID) { -// this.resourceID = resourceID; -// } -// -// public String getDataMoveID() { -// return dataMoveID; -// } -// -// public void setDataMoveID(String dataMoveID) { -// this.dataMoveID = dataMoveID; -// } -// -// public String getDataMoveType() { -// return dataMoveType; -// } -// -// public void setDataMoveType(String dataMoveType) { -// this.dataMoveType = dataMoveType; -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocol.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocol.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocol.java deleted file mode 100644 index d913e58..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocol.java +++ /dev/null @@ -1,77 +0,0 @@ -///* -// * -// * Licensed to the Apache Software Foundation (ASF) under one -// * or more contributor license agreements. See the NOTICE file -// * distributed with this work for additional information -// * regarding copyright ownership. The ASF licenses this file -// * to you under the Apache License, Version 2.0 (the -// * "License"); you may not use this file except in compliance -// * with the License. You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, -// * software distributed under the License is distributed on an -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// * KIND, either express or implied. See the License for the -// * specific language governing permissions and limitations -// * under the License. -// * -// */ -// -//package org.apache.aiaravata.application.catalog.data.model; -// -//import javax.persistence.*; -//import java.io.Serializable; -// -//@Entity -//@Table(name = "JOB_SUBMISSION_PROTOCOL") -//@IdClass(JobSubmissionProtocolPK.class) -//public class JobSubmissionProtocol implements Serializable { -// @Id -// @Column(name = "RESOURCE_ID") -// private String resourceID; -// @Id -// @Column(name = "SUBMISSION_ID") -// private String submissionID; -// -// @Id -// @Column(name = "JOB_TYPE") -// private String jobType; -// -// @ManyToOne(cascade= CascadeType.MERGE) -// @JoinColumn(name = "RESOURCE_ID") -// private ComputeResource computeResource; -// -// public String getResourceID() { -// return resourceID; -// } -// -// public void setResourceID(String resourceID) { -// this.resourceID = resourceID; -// } -// -// public String getSubmissionID() { -// return submissionID; -// } -// -// public void setSubmissionID(String submissionID) { -// this.submissionID = submissionID; -// } -// -// public String getJobType() { -// return jobType; -// } -// -// public void setJobType(String jobType) { -// this.jobType = jobType; -// } -// -// public ComputeResource getComputeResource() { -// return computeResource; -// } -// -// public void setComputeResource(ComputeResource computeResource) { -// this.computeResource = computeResource; -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocolPK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocolPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocolPK.java deleted file mode 100644 index aefe87a..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/JobSubmissionProtocolPK.java +++ /dev/null @@ -1,74 +0,0 @@ -///* -// * -// * Licensed to the Apache Software Foundation (ASF) under one -// * or more contributor license agreements. See the NOTICE file -// * distributed with this work for additional information -// * regarding copyright ownership. The ASF licenses this file -// * to you under the Apache License, Version 2.0 (the -// * "License"); you may not use this file except in compliance -// * with the License. You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, -// * software distributed under the License is distributed on an -// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// * KIND, either express or implied. See the License for the -// * specific language governing permissions and limitations -// * under the License. -// * -// */ -// -//package org.apache.aiaravata.application.catalog.data.model; -// -//import java.io.Serializable; -// -//public class JobSubmissionProtocolPK implements Serializable { -// private String resourceID; -// private String submissionID; -// private String jobType; -// -// public JobSubmissionProtocolPK(String resourceID, String submissionID, String jobType) { -// this.resourceID = resourceID; -// this.submissionID = submissionID; -// this.jobType = jobType; -// } -// -// public JobSubmissionProtocolPK() { -// ; -// } -// -// @Override -// public boolean equals(Object o) { -// return false; -// } -// -// @Override -// public int hashCode() { -// return 1; -// } -// -// public String getResourceID() { -// return resourceID; -// } -// -// public void setResourceID(String resourceID) { -// this.resourceID = resourceID; -// } -// -// public String getSubmissionID() { -// return submissionID; -// } -// -// public void setSubmissionID(String submissionID) { -// this.submissionID = submissionID; -// } -// -// public String getJobType() { -// return jobType; -// } -// -// public void setJobType(String jobType) { -// this.jobType = jobType; -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AbstractResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AbstractResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AbstractResource.java deleted file mode 100644 index e1b042d..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AbstractResource.java +++ /dev/null @@ -1,382 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.aiaravata.application.catalog.data.resources; - -public abstract class AbstractResource implements Resource { - // table names - public static final String COMPUTE_RESOURCE = "ComputeResource"; - public static final String HOST_ALIAS = "HostAlias"; - public static final String HOST_IPADDRESS = "HostIPAddress"; - public static final String GSISSH_SUBMISSION = "GSISSHSubmission"; - public static final String GSISSH_EXPORT = "GSISSHExport"; - public static final String PRE_JOBCOMMAND = "PreJobCommand"; - public static final String POST_JOBCOMMAND = "PostJobCommand"; - public static final String GLOBUS_SUBMISSION = "GlobusJobSubmission"; - public static final String UNICORE_JOB_SUBMISSION = "UnicoreJobSubmission"; - public static final String UNICORE_DATA_MOVEMENT = "UnicoreDataMovement"; - public static final String GLOBUS_GK_ENDPOINT = "GlobusGKEndpoint"; - public static final String SSH_SUBMISSION = "SSHSubmission"; - public static final String SCP_DATA_MOVEMENT = "ScpDataMovement"; - public static final String GRIDFTP_DATA_MOVEMENT = "GridftpDataMovement"; - public static final String GRIDFTP_ENDPOINT = "GridftpEndpoint"; - public static final String JOB_SUBMISSION_PROTOCOL = "JobSubmissionProtocol"; - public static final String DATA_MOVEMENT_PROTOCOL = "DataMovementProtocol"; - public static final String APPLICATION_MODULE = "ApplicationModule"; - public static final String APPLICATION_DEPLOYMENT = "ApplicationDeployment"; - public static final String LIBRARY_PREPAND_PATH = "LibraryPrepandPath"; - public static final String LIBRARY_APEND_PATH = "LibraryApendPath"; - public static final String APP_ENVIRONMENT = "AppEnvironment"; - public static final String APPLICATION_INTERFACE = "ApplicationInterface"; - public static final String APP_MODULE_MAPPING = "AppModuleMapping"; - public static final String APPLICATION_INPUT = "ApplicationInput"; - public static final String WORKFLOW_INPUT = "WorkflowInput"; - public static final String APPLICATION_OUTPUT = "ApplicationOutput"; - public static final String WORKFLOW_OUTPUT = "WorkflowOutput"; - public static final String GATEWAY_PROFILE = "GatewayProfile"; - public static final String COMPUTE_RESOURCE_PREFERENCE = "ComputeResourcePreference"; - public static final String BATCH_QUEUE = "BatchQueue"; - public static final String COMPUTE_RESOURCE_FILE_SYSTEM = "ComputeResourceFileSystem"; - public static final String JOB_SUBMISSION_INTERFACE = "JobSubmissionInterface"; - public static final String DATA_MOVEMENT_INTERFACE = "DataMovementInterface"; - public static final String RESOURCE_JOB_MANAGER = "ResourceJobManager"; - public static final String JOB_MANAGER_COMMAND = "JobManagerCommand"; - public static final String LOCAL_SUBMISSION = "LocalSubmission"; - public static final String LOCAL_DATA_MOVEMENT = "LocalDataMovement"; - public static final String SSH_JOB_SUBMISSION = "SshJobSubmission"; - public static final String EMAIL_PROPERTY = "EmailMonitorProperty"; - public static final String CLOUD_JOB_SUBMISSION = "CloudJobSubmission"; - public static final String MODULE_LOAD_CMD = "ModuleLoadCmd"; - public static final String WORKFLOW = "Workflow"; - - public final class EmailMonitorPropertyConstants { - public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionId"; - } - - // Compute Resource Table - public final class ComputeResourceConstants { - public static final String RESOURCE_DESCRIPTION = "resourceDescription"; - public static final String RESOURCE_ID = "resourceId"; - public static final String HOST_NAME = "hostName"; - } - - // Host Alias Table - public final class HostAliasConstants { - public static final String RESOURCE_ID = "resourceID"; - public static final String ALIAS = "alias"; - } - - // Host IPAddress Table - public final class HostIPAddressConstants { - public static final String RESOURCE_ID = "resourceID"; - public static final String IP_ADDRESS = "ipaddress"; - } - - // GSSISSH Submission Table - public final class GSISSHSubmissionConstants { - public static final String SUBMISSION_ID = "submissionID"; - public static final String RESOURCE_JOB_MANAGER = "resourceJobManager"; - public static final String SSH_PORT = "sshPort"; - public static final String INSTALLED_PATH = "installedPath"; - public static final String MONITOR_MODE = "monitorMode"; - } - - // GSSISSH Export Table - public final class GSISSHExportConstants { - public static final String SUBMISSION_ID = "submissionID"; - public static final String EXPORT = "export"; - } - - // GSSISSH Pre Job Command Table - public final class PreJobCommandConstants { - public static final String DEPLOYMENT_ID = "deploymentId"; - public static final String COMMAND = "command"; - } - - // GSSISSH Post Job Command Table - public final class PostJobCommandConstants { - public static final String DEPLOYMENT_ID = "deploymentId"; - public static final String COMMAND = "command"; - } - - // GSSISSH Post Job Command Table - public final class GlobusJobSubmissionConstants { - public static final String SUBMISSION_ID = "submissionID"; - public static final String RESOURCE_JOB_MANAGER = "resourceJobManager"; - public static final String SECURITY_PROTOCAL = "securityProtocol"; - public static final String GLOBUS_GATEKEEPER_EP = "globusEP"; - } - - // Unicore Post Job Command Table - public final class UnicoreJobSubmissionConstants { - public static final String SUBMISSION_ID = "submissionID"; - public static final String SECURITY_PROTOCAL = "securityProtocol"; - public static final String UNICORE_ENDPOINT_URL = "unicoreEndpointUrl"; - - } - - public final class UnicoreDataMovementConstants { - public static final String DATAMOVEMENT_ID = "dataMovementId"; - public static final String SECURITY_PROTOCAL = "securityProtocol"; - public static final String UNICORE_ENDPOINT_URL = "unicoreEndpointUrl"; - } - - - public final class GlobusEPConstants{ - public static final String SUBMISSION_ID = "submissionID"; - public static final String ENDPOINT = "endpoint"; - } - - // GSSISSH Post Job Command Table - public final class SSHSubmissionConstants { - public static final String SUBMISSION_ID = "submissionID"; - public static final String RESOURCE_JOB_MANAGER = "resourceJobManager"; - public static final String SSH_PORT = "sshPort"; - } - - // Scp Data Movement Table - public final class ScpDataMovementConstants { - public static final String QUEUE_DESCRIPTION = "queueDescription"; - public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId"; - public static final String SECURITY_PROTOCOL = "securityProtocol"; - public static final String ALTERNATIVE_SCP_HOSTNAME = "alternativeScpHostname"; - public static final String SSH_PORT = "sshPort"; - } - - public final class GridFTPDataMovementConstants { - public static final String DATA_MOVE_ID = "dataMoveID"; - public static final String SECURITY_PROTOCOL = "securityProtocol"; - public static final String GRID_FTP_EP = "gridFTPEP"; - } - - public final class GridFTPDMEPConstants{ - public static final String DATA_MOVE_ID = "dataMoveId"; - public static final String ENDPOINT = "endpoint"; - } - - public final class JobSubmissionProtocolConstants { - public static final String RESOURCE_ID = "resourceID"; - public static final String SUBMISSION_ID = "submissionID"; - public static final String JOB_TYPE = "jobType"; - } - - public final class DataMoveProtocolConstants { - public static final String RESOURCE_ID = "resourceID"; - public static final String DATA_MOVE_ID = "dataMoveID"; - public static final String DATA_MOVE_TYPE = "dataMoveType"; - } - - public final class ApplicationModuleConstants { - public static final String MODULE_ID = "moduleID"; - public static final String GATEWAY_ID = "gatewayId"; - public static final String MODULE_NAME = "moduleName"; - public static final String MODULE_VERSION = "moduleVersion"; - public static final String MODULE_DESC = "moduleDesc"; - } - - public final class ApplicationDeploymentConstants { - public static final String APP_MODULE_ID = "appModuleID"; - public static final String DEPLOYMENT_ID = "deploymentID"; - public static final String COMPUTE_HOST_ID = "hostID"; - public static final String GATEWAY_ID = "gatewayId"; - public static final String EXECUTABLE_PATH = "executablePath"; - public static final String APPLICATION_DESC = "applicationDesc"; - public static final String ENV_MODULE_LOAD_CMD = "envModuleLoaString"; - public static final String PARALLELISM = "parallelism"; - } - - public final class LibraryPrepandPathConstants { - public static final String DEPLOYMENT_ID = "deploymentID"; - public static final String NAME = "name"; - public static final String VALUE = "value"; - } - - public final class LibraryApendPathConstants { - public static final String DEPLOYMENT_ID = "deploymentID"; - public static final String NAME = "name"; - public static final String VALUE = "value"; - } - - public final class AppEnvironmentConstants { - public static final String DEPLOYMENT_ID = "deploymentID"; - public static final String NAME = "name"; - public static final String VALUE = "value"; - } - - public final class ApplicationInterfaceConstants { - public static final String INTERFACE_ID = "interfaceID"; - public static final String APPLICATION_NAME = "appName"; - public static final String GATEWAY_ID = "gatewayId"; - } - - public final class AppModuleMappingConstants { - public static final String INTERFACE_ID = "interfaceID"; - public static final String MODULE_ID = "moduleID"; - } - - public final class AppInputConstants { - public static final String INTERFACE_ID = "interfaceID"; - public static final String INPUT_KEY = "inputKey"; - public static final String INPUT_VALUE = "inputVal"; - public static final String DATA_TYPE = "dataType"; - public static final String METADATA = "metadata"; - public static final String APP_ARGUMENT = "appArgument"; - public static final String USER_FRIENDLY_DESC = "userFriendlyDesc"; - public static final String STANDARD_INPUT = "standardInput"; - } - - public final class AppOutputConstants { - public static final String INTERFACE_ID = "interfaceID"; - public static final String OUTPUT_KEY = "outputKey"; - public static final String OUTPUT_VALUE = "outputVal"; - public static final String DATA_TYPE = "dataType"; - } - - public final class WFInputConstants { - public static final String WF_TEMPLATE_ID = "wfTemplateId"; - public static final String INPUT_KEY = "inputKey"; - public static final String INPUT_VALUE = "inputVal"; - public static final String DATA_TYPE = "dataType"; - public static final String METADATA = "metadata"; - public static final String APP_ARGUMENT = "appArgument"; - public static final String USER_FRIENDLY_DESC = "userFriendlyDesc"; - public static final String STANDARD_INPUT = "standardInput"; - } - - public final class WFOutputConstants { - public static final String WF_TEMPLATE_ID = "wfTemplateId"; - public static final String OUTPUT_KEY = "outputKey"; - public static final String OUTPUT_VALUE = "outputVal"; - public static final String DATA_TYPE = "dataType"; - } - - public final class GatewayProfileConstants { - public static final String GATEWAY_ID = "gatewayID"; - public static final String GATEWAY_DESC = "gatewayDesc"; - } - - public final class ComputeResourcePreferenceConstants { - public static final String GATEWAY_ID = "gatewayId"; - public static final String RESOURCE_ID = "resourceId"; - public static final String OVERRIDE_BY_AIRAVATA = "overrideByAiravata"; - public static final String PREFERED_JOB_SUB_PROTOCOL = "preferedJobSubmissionProtocol"; - public static final String PREFERED_DATA_MOVE_PROTOCOL = "preferedDataMoveProtocol"; - public static final String PREFERED_BATCH_QUEUE = "batchQueue"; - public static final String SCRATCH_LOCATION = "scratchLocation"; - public static final String ALLOCATION_PROJECT_NUMBER = "projectNumber"; - } - - // Batch Queue Table - public final class BatchQueueConstants { - public static final String COMPUTE_RESOURCE_ID = "computeResourceId"; - public static final String MAX_RUNTIME = "maxRuntime"; - public static final String MAX_JOB_IN_QUEUE = "maxJobInQueue"; - public static final String QUEUE_DESCRIPTION = "queueDescription"; - public static final String QUEUE_NAME = "queueName"; - public static final String MAX_PROCESSORS = "maxProcessors"; - public static final String MAX_NODES = "maxNodes"; - } - - // Compute Resource File System Table - public final class ComputeResourceFileSystemConstants { - public static final String COMPUTE_RESOURCE_ID = "computeResourceId"; - public static final String PATH = "path"; - public static final String FILE_SYSTEM = "fileSystem"; - } - - // Job Submission Interface Table - public final class JobSubmissionInterfaceConstants { - public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionInterfaceId"; - public static final String COMPUTE_RESOURCE_ID = "computeResourceId"; - public static final String JOB_SUBMISSION_PROTOCOL = "jobSubmissionProtocol"; - public static final String PRIORITY_ORDER = "priorityOrder"; - } - - // Data Movement Interface Table - public final class DataMovementInterfaceConstants { - public static final String COMPUTE_RESOURCE_ID = "computeResourceId"; - public static final String DATA_MOVEMENT_PROTOCOL = "dataMovementProtocol"; - public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId"; - public static final String PRIORITY_ORDER = "priorityOrder"; - } - - // Resource Job Manager Table - public final class ResourceJobManagerConstants { - public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId"; - public static final String PUSH_MONITORING_ENDPOINT = "pushMonitoringEndpoint"; - public static final String JOB_MANAGER_BIN_PATH = "jobManagerBinPath"; - public static final String RESOURCE_JOB_MANAGER_TYPE = "resourceJobManagerType"; - } - - // Job Manager Command Table - public final class JobManagerCommandConstants { - public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId"; - public static final String COMMAND_TYPE = "commandType"; - public static final String COMMAND = "command"; - } - - // Gridftp Data Movement Table - public final class GridftpDataMovementConstants { - public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId"; - public static final String SECURITY_PROTOCOL = "securityProtocol"; - } - - // Gridftp Endpoint Table - public final class GridftpEndpointConstants { - public static final String ENDPOINT = "endpoint"; - public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId"; - } - - // Local Submission Table - public final class LocalSubmissionConstants { - public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId"; - public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionInterfaceId"; - } - - // Local Data Movement Table - public final class LocalDataMovementConstants { - public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId"; - } - - // Ssh Job Submission Table - public final class SshJobSubmissionConstants { - public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId"; - public static final String JOB_SUBMISSION_INTERFACE_ID = "jobSubmissionInterfaceId"; - public static final String ALTERNATIVE_SSH_HOSTNAME = "alternativeSshHostname"; - public static final String SECURITY_PROTOCOL = "securityProtocol"; - public static final String SSH_PORT = "sshPort"; - } - - // Module Load Cmd Table - public final class ModuleLoadCmdConstants { - public static final String CMD = "cmd"; - public static final String APP_DEPLOYMENT_ID = "appDeploymentId"; - } - - // Workflow Table - public final class WorkflowConstants { - public static final String WF_NAME = "wfName"; - public static final String CREATED_USER = "createdUser"; - public static final String GRAPH = "graph"; - public static final String WF_TEMPLATE_ID = "wfTemplateId"; - public static final String GATEWAY_ID = "gatewayId"; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java deleted file mode 100644 index a635666..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java +++ /dev/null @@ -1,446 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.aiaravata.application.catalog.data.resources; - -import org.airavata.appcatalog.cpi.AppCatalogException; -import org.apache.aiaravata.application.catalog.data.model.ApplicationDeployment; -import org.apache.aiaravata.application.catalog.data.model.ApplicationModule; -import org.apache.aiaravata.application.catalog.data.model.ComputeResource; -import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils; -import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator; -import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType; -import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.AiravataUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.persistence.EntityManager; -import javax.persistence.Query; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; - -public class AppDeploymentResource extends AbstractResource { - private final static Logger logger = LoggerFactory.getLogger(AppDeploymentResource.class); - private String deploymentId; - private String appModuleId; - private String hostId; - private String executablePath; - private String parallelism; - private String appDes; - private String gatewayId; - private ComputeResourceResource hostResource; - private AppModuleResource moduleResource; - private Timestamp createdTime; - private Timestamp updatedTime; - - public String getGatewayId() { - return gatewayId; - } - - public void setGatewayId(String gatewayId) { - this.gatewayId = gatewayId; - } - - public Timestamp getCreatedTime() { - return createdTime; - } - - public void setCreatedTime(Timestamp createdTime) { - this.createdTime = createdTime; - } - - public Timestamp getUpdatedTime() { - return updatedTime; - } - - public void setUpdatedTime(Timestamp updatedTime) { - this.updatedTime = updatedTime; - } - - public String getDeploymentId() { - return deploymentId; - } - - public void setDeploymentId(String deploymentId) { - this.deploymentId = deploymentId; - } - - public String getAppModuleId() { - return appModuleId; - } - - public void setAppModuleId(String appModuleId) { - this.appModuleId = appModuleId; - } - - public String getHostId() { - return hostId; - } - - public void setHostId(String hostId) { - this.hostId = hostId; - } - - public String getExecutablePath() { - return executablePath; - } - - public void setExecutablePath(String executablePath) { - this.executablePath = executablePath; - } - - public String getAppDes() { - return appDes; - } - - public void setAppDes(String appDes) { - this.appDes = appDes; - } - - public ComputeResourceResource getHostResource() { - return hostResource; - } - - public void setHostResource(ComputeResourceResource hostResource) { - this.hostResource = hostResource; - } - - public AppModuleResource getModuleResource() { - return moduleResource; - } - - public void setModuleResource(AppModuleResource moduleResource) { - this.moduleResource = moduleResource; - } - - @Override - public void remove(Object identifier) throws AppCatalogException { - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - AppCatalogQueryGenerator generator= new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT); - generator.setParameter(ApplicationDeploymentConstants.DEPLOYMENT_ID, identifier); - Query q = generator.deleteQuery(em); - q.executeUpdate(); - em.getTransaction().commit(); - em.close(); - } catch (ApplicationSettingsException e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()){ - em.getTransaction().rollback(); - } - em.close(); - } - } - } - - @Override - public Resource get(Object identifier) throws AppCatalogException { - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT); - generator.setParameter(ApplicationDeploymentConstants.DEPLOYMENT_ID, identifier); - Query q = generator.selectQuery(em); - ApplicationDeployment deployment = (ApplicationDeployment) q.getSingleResult(); - AppDeploymentResource deploymentResource = - (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment); - em.getTransaction().commit(); - em.close(); - return deploymentResource; - } catch (ApplicationSettingsException e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()) { - em.getTransaction().rollback(); - } - em.close(); - } - } - } - - @Override - public List<Resource> get(String fieldName, Object value) throws AppCatalogException { - List<Resource> appDeployments = new ArrayList<Resource>(); - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - Query q; - AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT); - List results; - if (fieldName.equals(ApplicationDeploymentConstants.APP_MODULE_ID)) { - generator.setParameter(ApplicationDeploymentConstants.APP_MODULE_ID, value); - q = generator.selectQuery(em); - results = q.getResultList(); - if (results.size() != 0) { - for (Object result : results) { - ApplicationDeployment deployment = (ApplicationDeployment) result; - AppDeploymentResource deploymentResource = - (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment); - appDeployments.add(deploymentResource); - } - } - } else if (fieldName.equals(ApplicationDeploymentConstants.COMPUTE_HOST_ID)) { - generator.setParameter(ApplicationDeploymentConstants.COMPUTE_HOST_ID, value); - q = generator.selectQuery(em); - results = q.getResultList(); - if (results.size() != 0) { - for (Object result : results) { - ApplicationDeployment deployment = (ApplicationDeployment) result; - AppDeploymentResource deploymentResource = - (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment); - appDeployments.add(deploymentResource); - } - } - }else { - em.getTransaction().commit(); - em.close(); - logger.error("Unsupported field name for app deployment resource.", new IllegalArgumentException()); - throw new IllegalArgumentException("Unsupported field name for app deployment resource."); - } - em.getTransaction().commit(); - em.close(); - } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()) { - em.getTransaction().rollback(); - } - em.close(); - } - } - return appDeployments; - } - - @Override - public List<Resource> getAll() throws AppCatalogException { - List<Resource> appDeployments = new ArrayList<Resource>(); - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT); - generator.setParameter(ApplicationDeploymentConstants.GATEWAY_ID, gatewayId); - Query q = generator.selectQuery(em); - List results = q.getResultList(); - if (results.size() != 0) { - for (Object result : results) { - ApplicationDeployment deployment = (ApplicationDeployment) result; - AppDeploymentResource deploymentResource = - (AppDeploymentResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APPLICATION_DEPLOYMENT, deployment); - appDeployments.add(deploymentResource); - } - } - em.getTransaction().commit(); - em.close(); - } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()) { - em.getTransaction().rollback(); - } - em.close(); - } - } - return appDeployments; - } - - @Override - public List<String> getAllIds() throws AppCatalogException { - List<String> appDeployments = new ArrayList<String>(); - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT); - Query q = generator.selectQuery(em); - List results = q.getResultList(); - if (results.size() != 0) { - for (Object result : results) { - ApplicationDeployment deployment = (ApplicationDeployment) result; - appDeployments.add(deployment.getDeploymentID()); - } - } - em.getTransaction().commit(); - em.close(); - } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()) { - em.getTransaction().rollback(); - } - em.close(); - } - } - return appDeployments; - } - - @Override - public List<String> getIds(String fieldName, Object value) throws AppCatalogException { - List<String> appDeployments = new ArrayList<String>(); - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - Query q; - AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(APPLICATION_DEPLOYMENT); - List results; - if (fieldName.equals(ApplicationDeploymentConstants.APP_MODULE_ID)) { - generator.setParameter(ApplicationDeploymentConstants.APP_MODULE_ID, value); - q = generator.selectQuery(em); - results = q.getResultList(); - if (results.size() != 0) { - for (Object result : results) { - ApplicationDeployment deployment = (ApplicationDeployment) result; - appDeployments.add(deployment.getDeploymentID()); - } - } - } else if (fieldName.equals(ApplicationDeploymentConstants.COMPUTE_HOST_ID)) { - generator.setParameter(ApplicationDeploymentConstants.COMPUTE_HOST_ID, value); - q = generator.selectQuery(em); - results = q.getResultList(); - if (results.size() != 0) { - for (Object result : results) { - ApplicationDeployment deployment = (ApplicationDeployment) result; - appDeployments.add(deployment.getDeploymentID()); - } - } - }else { - em.getTransaction().commit(); - em.close(); - logger.error("Unsupported field name for app deployment resource.", new IllegalArgumentException()); - throw new IllegalArgumentException("Unsupported field name for app deployment resource."); - } - em.getTransaction().commit(); - em.close(); - } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()) { - em.getTransaction().rollback(); - } - em.close(); - } - } - return appDeployments; - } - - @Override - public void save() throws AppCatalogException { - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - ApplicationDeployment existingDeployment = em.find(ApplicationDeployment.class, deploymentId); - em.close(); - - em = AppCatalogJPAUtils.getEntityManager(); - em.getTransaction().begin(); - ApplicationModule applicationModule = em.find(ApplicationModule.class, appModuleId); - ComputeResource computeHost = em.find(ComputeResource.class, hostId); - if (existingDeployment != null){ - existingDeployment.setDeploymentID(deploymentId); - existingDeployment.setApplicationDesc(appDes); - existingDeployment.setAppModuleID(appModuleId); - existingDeployment.setApplicationModule(applicationModule); - existingDeployment.setComputeResource(computeHost); - existingDeployment.setHostID(hostId); - existingDeployment.setExecutablePath(executablePath); - existingDeployment.setParallelism(parallelism); - existingDeployment.setGatewayId(gatewayId); - existingDeployment.setUpdateTime(AiravataUtils.getCurrentTimestamp()); - em.merge(existingDeployment); - }else { - ApplicationDeployment deployment = new ApplicationDeployment(); - deployment.setApplicationDesc(appDes); - deployment.setDeploymentID(deploymentId); - deployment.setAppModuleID(appModuleId); - deployment.setHostID(hostId); - deployment.setApplicationModule(applicationModule); - deployment.setComputeResource(computeHost); - deployment.setExecutablePath(executablePath); - deployment.setParallelism(parallelism); - deployment.setGatewayId(gatewayId); - deployment.setCreationTime(AiravataUtils.getCurrentTimestamp()); - em.persist(deployment); - } - em.getTransaction().commit(); - em.close(); - } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()){ - em.getTransaction().rollback(); - } - em.close(); - } - } - - } - - @Override - public boolean isExists(Object identifier) throws AppCatalogException { - EntityManager em = null; - try { - em = AppCatalogJPAUtils.getEntityManager(); - ApplicationDeployment deployment = em.find(ApplicationDeployment.class, identifier); - em.close(); - return deployment != null; - } catch (ApplicationSettingsException e) { - logger.error(e.getMessage(), e); - throw new AppCatalogException(e); - } finally { - if (em != null && em.isOpen()) { - if (em.getTransaction().isActive()){ - em.getTransaction().rollback(); - } - em.close(); - } - } - } - - public String getParallelism() { - return parallelism; - } - - public void setParallelism(String parallelism) { - this.parallelism = parallelism; - } -}
