Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c83330e9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c83330e9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c83330e9 Branch: refs/heads/master Commit: c83330e98aecfd7d60865d69d1450faf759670d7 Parents: 33fafe0 ace68a6 Author: raminder <[email protected]> Authored: Wed Jun 4 11:18:32 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Jun 4 11:18:32 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 102 +- .../handler/ApplicationCatalogHandler.java | 4 +- .../client/samples/CreateLaunchExperiment.java | 2 +- .../samples/TestCreateLaunchExperiment.java | 548 +++++++ .../apache/airavata/client/AiravataClient.java | 8 +- .../client/api/CredentialStoreManager.java | 9 +- .../airavata/client/api/ProvenanceManager.java | 5 +- .../client/impl/ApplicationManagerImpl.java | 26 +- .../client/impl/ProvenanceManagerImpl.java | 4 +- .../client/impl/WorkflowManagerImpl.java | 10 +- .../main/resources/airavata-server.properties | 2 +- .../airavata/gfac/server/GfacServerHandler.java | 9 +- .../gfac/client/GfacClientFactoryTest.java | 2 +- .../airavata/gfac/client/util/Initialize.java | 3 + .../gfac/core/handler/AbstractHandler.java | 7 +- .../gfac/core/provider/AbstractProvider.java | 7 +- .../server/OrchestratorServerHandler.java | 2 + .../client/OrchestratorClientFactoryTest.java | 2 +- .../orchestrator/client/util/Initialize.java | 3 + .../client/sample/OrchestratorClientSample.java | 3 + .../core/utils/OrchestratorUtils.java | 4 +- .../validator/impl/SimpleAppDataValidator.java | 7 +- .../cpi/impl/AbstractOrchestrator.java | 11 +- .../orchestrator/core/util/Initialize.java | 3 + .../persistance/registry/jpa/Resource.java | 14 +- .../persistance/registry/jpa/ResourceUtils.java | 296 ++-- .../registry/jpa/impl/AiravataJPARegistry.java | 1435 ++++++++++-------- .../registry/jpa/impl/ExperimentRegistry.java | 422 ++--- .../registry/jpa/impl/GatewayRegistry.java | 5 +- .../registry/jpa/impl/ProjectRegistry.java | 35 +- .../registry/jpa/impl/RegistryFactory.java | 26 +- .../registry/jpa/impl/RegistryImpl.java | 4 +- .../persistance/registry/jpa/impl/UserReg.java | 11 +- .../jpa/model/AdvancedInputDataHandling.java | 6 +- .../jpa/model/AdvancedOutputDataHandling.java | 6 +- .../registry/jpa/model/ApplicationInput.java | 6 +- .../registry/jpa/model/ApplicationInput_PK.java | 4 +- .../registry/jpa/model/ApplicationOutput.java | 6 +- .../jpa/model/ApplicationOutput_PK.java | 4 +- .../jpa/model/Application_Descriptor.java | 3 +- .../jpa/model/Application_Descriptor_PK.java | 4 +- .../Computational_Resource_Scheduling.java | 6 +- .../registry/jpa/model/Configuration.java | 3 + .../registry/jpa/model/Configuration_PK.java | 4 +- .../registry/jpa/model/DataTransferDetail.java | 6 +- .../registry/jpa/model/ErrorDetail.java | 6 +- .../registry/jpa/model/Experiment.java | 6 +- .../jpa/model/ExperimentConfigData.java | 6 +- .../registry/jpa/model/Experiment_Input.java | 6 +- .../registry/jpa/model/Experiment_Input_PK.java | 4 +- .../registry/jpa/model/Experiment_Output.java | 6 +- .../jpa/model/Experiment_Output_PK.java | 4 +- .../persistance/registry/jpa/model/Gateway.java | 6 +- .../registry/jpa/model/Gateway_Worker.java | 6 +- .../registry/jpa/model/Gateway_Worker_PK.java | 4 +- .../registry/jpa/model/Host_Descriptor.java | 3 +- .../registry/jpa/model/Host_Descriptor_PK.java | 4 +- .../registry/jpa/model/JobDetail.java | 6 +- .../registry/jpa/model/JobDetails_PK.java | 4 +- .../registry/jpa/model/NodeInput.java | 6 +- .../registry/jpa/model/NodeInput_PK.java | 4 +- .../registry/jpa/model/NodeOutput.java | 6 +- .../registry/jpa/model/NodeOutput_PK.java | 4 +- .../persistance/registry/jpa/model/Project.java | 6 +- .../registry/jpa/model/ProjectUser.java | 6 +- .../registry/jpa/model/ProjectUser_PK.java | 4 +- .../registry/jpa/model/Published_Workflow.java | 3 +- .../jpa/model/Published_Workflow_PK.java | 4 +- .../registry/jpa/model/QosParam.java | 6 +- .../registry/jpa/model/Service_Descriptor.java | 3 +- .../jpa/model/Service_Descriptor_PK.java | 4 +- .../persistance/registry/jpa/model/Status.java | 6 +- .../registry/jpa/model/TaskDetail.java | 6 +- .../registry/jpa/model/User_Workflow.java | 3 +- .../registry/jpa/model/User_Workflow_PK.java | 4 +- .../persistance/registry/jpa/model/Users.java | 6 +- .../registry/jpa/model/WorkflowNodeDetail.java | 6 +- .../jpa/resources/AbstractResource.java | 5 +- .../AdvanceInputDataHandlingResource.java | 80 +- .../AdvancedOutputDataHandlingResource.java | 79 +- ...avataRegistryConnectionDataProviderImpl.java | 5 - .../ApplicationDescriptorResource.java | 52 +- .../jpa/resources/ApplicationInputResource.java | 86 +- .../resources/ApplicationOutputResource.java | 87 +- .../ComputationSchedulingResource.java | 89 +- .../jpa/resources/ConfigDataResource.java | 80 +- .../jpa/resources/ConfigurationResource.java | 76 +- .../resources/DataTransferDetailResource.java | 234 +-- .../jpa/resources/ErrorDetailResource.java | 87 +- .../jpa/resources/ExperimentInputResource.java | 75 +- .../jpa/resources/ExperimentOutputResource.java | 75 +- .../jpa/resources/ExperimentResource.java | 659 ++++---- .../registry/jpa/resources/GatewayResource.java | 803 +++++----- .../jpa/resources/HostDescriptorResource.java | 94 +- .../jpa/resources/JobDetailResource.java | 296 ++-- .../jpa/resources/NodeInputResource.java | 85 +- .../jpa/resources/NodeOutputResource.java | 86 +- .../registry/jpa/resources/ProjectResource.java | 282 ++-- .../jpa/resources/ProjectUserResource.java | 81 +- .../jpa/resources/PublishWorkflowResource.java | 107 +- .../jpa/resources/QosParamResource.java | 65 +- .../resources/ServiceDescriptorResource.java | 126 +- .../registry/jpa/resources/StatusResource.java | 100 +- .../jpa/resources/TaskDetailResource.java | 662 ++++---- .../registry/jpa/resources/UserResource.java | 75 +- .../jpa/resources/UserWorkflowResource.java | 112 +- .../registry/jpa/resources/WorkerResource.java | 500 +++--- .../resources/WorkflowNodeDetailResource.java | 455 +++--- .../jpa/utils/ThriftDataModelConversion.java | 25 +- .../registry/jpa/util/Initialize.java | 3 + .../registry/api/AiravataRegistry2.java | 6 +- .../AiravataRegistryConnectionDataProvider.java | 1 - .../registry/api/AiravataRegistryFactory.java | 54 +- .../registry/api/ConfigurationRegistry.java | 50 +- .../registry/api/CredentialRegistry.java | 18 +- .../airavata/registry/api/DataRegistry.java | 10 +- .../registry/api/DescriptorRegistry.java | 52 +- .../registry/api/OrchestratorRegistry.java | 38 +- .../airavata/registry/api/ProjectsRegistry.java | 26 +- .../registry/api/ProvenanceRegistry.java | 244 +-- .../registry/api/PublishedWorkflowRegistry.java | 18 +- .../airavata/registry/api/UserRegistry.java | 6 +- .../registry/api/UserWorkflowRegistry.java | 16 +- .../airavata/registry/api/WorkspaceProject.java | 8 +- .../AiravataRegUninitializedException.java | 32 + .../AiravataRegistryUninitializedException.java | 32 - .../DeploymentDescriptionRetrieveException.java | 2 +- .../GatewayNotRegisteredException.java | 2 +- .../HostDescriptionRetrieveException.java | 2 +- .../RegAPIVersionIncompatibleException.java | 39 + .../RegAccessorInstantiateException.java | 32 + .../exception/RegAccessorInvalidException.java | 32 + .../exception/RegAccessorNotFoundException.java | 32 + .../RegAccessorUndefinedException.java | 40 + .../registry/api/exception/RegException.java | 39 + ...RegistryAPIVersionIncompatibleException.java | 41 - .../RegistryAccessorInstantiateException.java | 32 - .../RegistryAccessorInvalidException.java | 32 - .../RegistryAccessorNotFoundException.java | 32 - .../RegistryAccessorUndefinedException.java | 40 - .../api/exception/RegistryException.java | 39 - .../ServiceDescriptionRetrieveException.java | 2 +- .../UnimplementedRegOperationException.java | 32 + ...UnimplementedRegistryOperationException.java | 32 - .../UnknownRegConnectionDataException.java | 36 + .../UnknownRegistryConnectionDataException.java | 36 - .../DescriptorAlreadyExistsException.java | 4 +- .../DescriptorDoesNotExistsException.java | 4 +- .../gateway/InsufficientDataException.java | 4 +- .../gateway/MalformedDescriptorException.java | 4 +- ...PublishedWorkflowAlreadyExistsException.java | 4 +- ...PublishedWorkflowDoesNotExistsException.java | 4 +- .../ApplicationJobAlreadyExistsException.java | 4 +- .../ApplicationJobDoesNotExistsException.java | 4 +- .../ExperimentAlreadyExistsException.java | 4 +- .../ExperimentDoesNotExistsException.java | 4 +- .../InvalidApplicationJobIDException.java | 4 +- .../UserWorkflowAlreadyExistsException.java | 4 +- .../UserWorkflowDoesNotExistsException.java | 4 +- .../WorkflowInstanceAlreadyExistsException.java | 4 +- .../WorkflowInstanceDoesNotExistsException.java | 4 +- ...kflowInstanceNodeAlreadyExistsException.java | 4 +- ...kflowInstanceNodeDoesNotExistsException.java | 4 +- .../WorkspaceProjectAlreadyExistsException.java | 4 +- .../WorkspaceProjectDoesNotExistsException.java | 4 +- .../registry/api/util/RegistryUtils.java | 29 +- 166 files changed, 5869 insertions(+), 4394 deletions(-) ----------------------------------------------------------------------
