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/6c4471ad Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6c4471ad Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6c4471ad Branch: refs/heads/master Commit: 6c4471ada3585716426ff3ed1d8712b53e9b7126 Parents: b3775ec 36d0b76 Author: raminder <[email protected]> Authored: Mon Aug 25 12:00:17 2014 -0400 Committer: raminder <[email protected]> Committed: Mon Aug 25 12:00:17 2014 -0400 ---------------------------------------------------------------------- .../java-client-samples/pom.xml | 29 +- .../client/samples/CancelExperiments.java | 2 - .../client/samples/CreateLaunchExperiment.java | 145 +- .../samples/CreateLaunchExperimentUS3.java | 80 +- .../samples/TestCreateLaunchExperiment.java | 56 +- .../tools/RegisterSampleApplications.java | 70 +- modules/airavata-client/pom.xml | 5 - .../airavata/client/AiravataAPIFactory.java | 24 +- .../apache/airavata/client/AiravataClient.java | 256 +- .../apache/airavata/client/api/AiravataAPI.java | 5 +- .../airavata/client/api/AiravataManager.java | 6 +- .../org/apache/airavata/client/api/BaseAPI.java | 3 +- .../client/api/CredentialStoreManager.java | 22 +- .../airavata/client/api/ExecutionManager.java | 172 +- .../airavata/client/api/ProvenanceManager.java | 938 +++--- .../client/impl/AiravataManagerImpl.java | 264 +- .../client/impl/ApplicationManagerImpl.java | 525 ++-- .../client/impl/CredentialStoreManagerImpl.java | 50 +- .../client/impl/ExecutionManagerImpl.java | 366 ++- .../client/impl/PasswordCallBackImpl.java | 78 +- .../client/impl/ProvenanceManagerImpl.java | 1273 ++++---- .../client/impl/WorkflowManagerImpl.java | 365 +-- .../client/tools/DocumentCreatorNew.java | 34 +- .../client/tools/PeriodicExecutorThread.java | 1 - .../client/airavata/AiravataClientTest.java | 16 +- .../catalog/data/util/AppCatalogJPAUtils.java | 1 + .../main/resources/airavata-client.properties | 2 +- .../main/resources/airavata-server.properties | 2 +- modules/distribution/client/java/pom.xml | 10 - .../java/src/main/assembly/bin-assembly.xml | 2 - modules/distribution/server/pom.xml | 10 - .../server/src/main/assembly/bin-assembly.xml | 2 - modules/gfac/airavata-gfac-service/pom.xml | 25 + .../airavata/gfac/server/GfacServerHandler.java | 27 +- .../airavata/gfac/client/util/Initialize.java | 9 +- .../gfac/bes/provider/impl/BESProvider.java | 88 +- modules/gfac/gfac-core/pom.xml | 10 - .../apache/airavata/gfac/GFacConfiguration.java | 16 +- .../org/apache/airavata/gfac/Scheduler.java | 10 - .../airavata/gfac/core/cpi/BetterGfacImpl.java | 34 +- .../apache/airavata/gfac/core/cpi/GFacImpl.java | 1356 +++++---- .../gfac/core/handler/AbstractHandler.java | 4 +- .../handler/AbstractRecoverableHandler.java | 4 +- .../core/handler/AppDescriptorCheckHandler.java | 5 - .../gfac/core/provider/AbstractProvider.java | 3 +- .../provider/AbstractRecoverableProvider.java | 3 +- .../airavata/gfac/core/utils/GFacUtils.java | 303 +- .../apache/airavata/job/GFacConfigXmlTest.java | 10 +- modules/gfac/gfac-ec2/pom.xml | 5 - .../apache/airavata/gfac/ec2/EC2Provider.java | 18 +- .../airavata/gfac/ec2/EC2ProviderTest.java | 6 +- .../impl/GramProviderTestWithMyProxyAuth.java | 6 +- .../gsissh/provider/impl/GSISSHProvider.java | 5 +- .../impl/GSISSHProviderTestWithMyProxyAuth.java | 6 +- .../gfac/services/impl/LocalProviderTest.java | 2 +- modules/gfac/gfac-monitor/pom.xml | 10 - .../handlers/GridPullMonitorHandler.java | 5 +- .../handlers/GridPushMonitorHandler.java | 4 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 75 +- .../gfac/ssh/provider/impl/SSHProvider.java | 3 +- .../services/impl/BigRed2TestWithSSHAuth.java | 6 +- .../impl/SSHProviderTestWithSSHAuth.java | 6 +- .../integration/AbstractIntegrationTest.java | 22 +- .../apache/airavata/integration/BaseCaseIT.java | 96 +- .../airavata/integration/DataRetrievalIT.java | 24 +- .../airavata/integration/ForEachCaseIT.java | 134 +- .../integration/PasswordCallbackImpl.java | 78 +- .../SingleAppIntegrationTestBase.java | 2 +- .../WorkflowIntegrationTestBase.java | 341 +-- .../integration/WorkflowSamplesCaseIT.java | 162 +- .../server/OrchestratorServerHandler.java | 38 +- .../client/OrchestratorClientFactoryTest.java | 26 +- .../orchestrator/client/util/Initialize.java | 7 +- modules/orchestrator/orchestrator-core/pom.xml | 10 +- .../core/OrchestratorConfiguration.java | 12 - .../core/context/OrchestratorContext.java | 11 - .../core/impl/GFACEmbeddedJobSubmitter.java | 6 +- .../core/impl/GFACServiceJobSubmitter.java | 2 - .../core/utils/OrchestratorUtils.java | 25 +- .../cpi/impl/AbstractOrchestrator.java | 98 +- .../cpi/impl/SimpleOrchestratorImpl.java | 10 +- .../orchestrator/core/BaseOrchestratorTest.java | 38 +- .../orchestrator/core/NewOrchestratorTest.java | 21 - .../orchestrator/core/util/Initialize.java | 9 +- modules/registry/airavata-jpa-registry/pom.xml | 5 - .../registry/jpa/JPAResourceAccessor.java | 49 - .../persistance/registry/jpa/ResourceUtils.java | 2 +- .../registry/jpa/impl/AiravataJPARegistry.java | 2838 ------------------ ...avataRegistryConnectionDataProviderImpl.java | 42 - .../jpa/resources/ExperimentDataRetriever.java | 543 ---- .../registry/jpa/resources/UserResource.java | 7 +- .../registry/jpa/AbstractResourceTest.java | 2 +- .../registry/jpa/util/Initialize.java | 9 +- modules/registry/pom.xml | 1 - modules/registry/registry-api/pom.xml | 80 - .../registry/api/AiravataExperiment.java | 73 - .../registry/api/AiravataRegistry2.java | 65 - .../AiravataRegistryConnectionDataProvider.java | 29 - .../registry/api/AiravataRegistryFactory.java | 140 - .../registry/api/AiravataSubRegistry.java | 97 - .../airavata/registry/api/AiravataUser.java | 48 - .../registry/api/ConfigurationRegistry.java | 59 - .../registry/api/CredentialRegistry.java | 69 - .../airavata/registry/api/DataRegistry.java | 50 - .../registry/api/DescriptorRegistry.java | 74 - .../airavata/registry/api/ExecutionErrors.java | 33 - .../apache/airavata/registry/api/Gateway.java | 47 - .../registry/api/OrchestratorRegistry.java | 120 - .../airavata/registry/api/PasswordCallback.java | 25 - .../airavata/registry/api/ProjectsRegistry.java | 50 - .../registry/api/ProvenanceRegistry.java | 528 ---- .../registry/api/PublishedWorkflowRegistry.java | 45 - .../airavata/registry/api/ResourceMetadata.java | 70 - .../airavata/registry/api/UserRegistry.java | 39 - .../registry/api/UserWorkflowRegistry.java | 43 - .../airavata/registry/api/WorkspaceProject.java | 95 - .../AiravataRegUninitializedException.java | 32 - .../DeploymentDescriptionRetrieveException.java | 35 - .../GatewayNotRegisteredException.java | 32 - .../HostDescriptionRetrieveException.java | 33 - .../RegAPIVersionIncompatibleException.java | 39 - .../RegAccessorInstantiateException.java | 32 - .../exception/RegAccessorInvalidException.java | 32 - .../exception/RegAccessorNotFoundException.java | 32 - .../RegAccessorUndefinedException.java | 40 - .../registry/api/exception/RegException.java | 39 - .../exception/RegistrySettingsException.java | 37 - .../RegistrySettingsLoadException.java | 38 - .../ServiceDescriptionRetrieveException.java | 35 - .../UnimplementedRegOperationException.java | 32 - .../UnknownRegConnectionDataException.java | 36 - .../UnspecifiedRegistrySettingsException.java | 30 - .../DescriptorAlreadyExistsException.java | 34 - .../DescriptorDoesNotExistsException.java | 34 - .../gateway/InsufficientDataException.java | 34 - .../gateway/MalformedDescriptorException.java | 34 - ...PublishedWorkflowAlreadyExistsException.java | 34 - ...PublishedWorkflowDoesNotExistsException.java | 34 - .../ApplicationJobAlreadyExistsException.java | 34 - .../ApplicationJobDoesNotExistsException.java | 34 - .../ExperimentAlreadyExistsException.java | 34 - .../ExperimentDoesNotExistsException.java | 34 - .../worker/ExperimentLazyLoadedException.java | 34 - .../InvalidApplicationJobIDException.java | 34 - .../UserWorkflowAlreadyExistsException.java | 34 - .../UserWorkflowDoesNotExistsException.java | 34 - .../WorkflowInstanceAlreadyExistsException.java | 34 - .../WorkflowInstanceDoesNotExistsException.java | 34 - ...kflowInstanceNodeAlreadyExistsException.java | 34 - ...kflowInstanceNodeDoesNotExistsException.java | 34 - .../WorkspaceProjectAlreadyExistsException.java | 34 - .../WorkspaceProjectDoesNotExistsException.java | 34 - .../registry/api/impl/ExperimentDataImpl.java | 221 -- .../api/impl/WorkflowExecutionDataImpl.java | 182 -- .../api/orchestrator/OrchestratorData.java | 113 - .../orchestrator/impl/OrchestratorDataImpl.java | 112 - .../registry/api/util/RegistryConstants.java | 36 - .../registry/api/util/RegistrySettings.java | 127 - .../registry/api/util/RegistryUtils.java | 124 - .../registry/api/util/WebServiceUtil.java | 202 -- .../registry/api/workflow/ApplicationJob.java | 295 -- .../workflow/ApplicationJobExecutionError.java | 67 - .../api/workflow/ApplicationJobStatusData.java | 63 - .../registry/api/workflow/ExecutionError.java | 103 - .../registry/api/workflow/ExperimentData.java | 123 - .../api/workflow/ExperimentExecutionError.java | 40 - .../api/workflow/ExperimentMetadata.java | 49 - .../registry/api/workflow/ExperimentName.java | 49 - .../registry/api/workflow/ExperimentUser.java | 48 - .../registry/api/workflow/InputData.java | 34 - .../api/workflow/NodeExecutionData.java | 236 -- .../api/workflow/NodeExecutionError.java | 58 - .../api/workflow/NodeExecutionStatus.java | 78 - .../registry/api/workflow/OutputData.java | 34 - .../api/workflow/WorkflowExecution.java | 69 - .../api/workflow/WorkflowExecutionData.java | 118 - .../api/workflow/WorkflowExecutionError.java | 49 - .../api/workflow/WorkflowExecutionStatus.java | 128 - .../registry/api/workflow/WorkflowIOData.java | 58 - .../api/workflow/WorkflowInstanceNode.java | 67 - .../workflow/WorkflowInstanceNodePortData.java | 89 - .../api/workflow/WorkflowNodeGramData.java | 83 - .../api/workflow/WorkflowNodeIOData.java | 114 - .../registry/api/workflow/WorkflowNodeType.java | 84 - .../api/workflow/WorkflowRunTimeData.java | 90 - modules/registry/registry-cpi/pom.xml | 5 + .../registry/cpi/utils/RegistrySettings.java | 127 + modules/test-suite/pom.xml | 6 - modules/workflow-model/workflow-engine/pom.xml | 12 - .../WorkflowInterpreterConfiguration.java | 2 - modules/ws-messenger/messagebox/pom.xml | 5 - modules/ws-messenger/messagebroker/pom.xml | 5 - modules/xbaya-gui/pom.xml | 5 - .../xbaya/registry/PasswordCallbackImpl.java | 78 +- .../ui/experiment/LaunchApplicationWindow.java | 400 +++ .../airavata/xbaya/ui/menues/RunMenuItem.java | 9 +- pom.xml | 2 +- samples/java-client/experiment/pom.xml | 22 - tools/registry-tool/pom.xml | 5 - 199 files changed, 4487 insertions(+), 14200 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6c4471ad/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java ----------------------------------------------------------------------
