Merge branch 'moduleRefactor'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/093643ac Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/093643ac Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/093643ac Branch: refs/heads/master Commit: 093643ac3e090faafb1620ed71fcbe47d548fd1a Parents: 13c2e79 5a648a6 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 5 11:02:41 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 5 11:02:41 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(-) ----------------------------------------------------------------------
