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/f9b95c93 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f9b95c93 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f9b95c93 Branch: refs/heads/master Commit: f9b95c93a269fa36dacae5a0595cbbbe7f20ad18 Parents: e181bfb c00025f Author: Saminda Wijeratne <[email protected]> Authored: Tue Mar 11 15:54:19 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Mar 11 15:54:19 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 45 +++- .../src/main/resources/registry-derby.sql | 13 +- .../src/main/resources/registry-mysql.sql | 13 +- .../java-client-samples/pom.xml | 10 +- .../client/samples/CreateLaunchExperiment.java | 21 ++ .../main/resources/airavata-client.properties | 4 +- .../airavata/client/tools/DocumentCreator.java | 6 - modules/airavata-job-monitor/pom.xml | 22 +- .../apache/airavata/job/monitor/MonitorID.java | 30 ++- .../monitor/impl/pull/qstat/QstatMonitor.java | 6 +- .../impl/push/amqp/JSONMessageParser.java | 11 +- .../src/main/resources/schema/AccessPolicy.json | 13 + .../src/main/resources/schema/Activity.json | 31 +++ .../src/main/resources/schema/AdminDomain.json | 51 ++++ .../schema/ApplicationEnvironment.json | 86 +++++++ .../resources/schema/ApplicationHandle.json | 21 ++ .../src/main/resources/schema/Benchmark.json | 21 ++ .../resources/schema/ComputingActivity.json | 165 +++++++++++++ .../resources/schema/ComputingEndpoint.json | 44 ++++ .../main/resources/schema/ComputingManager.json | 117 +++++++++ .../main/resources/schema/ComputingService.json | 32 +++ .../main/resources/schema/ComputingShare.json | 182 ++++++++++++++ .../src/main/resources/schema/Contact.json | 32 +++ .../src/main/resources/schema/DataStore.json | 30 +++ .../src/main/resources/schema/Domain.json | 30 +++ .../src/main/resources/schema/Endpoint.json | 147 +++++++++++ .../src/main/resources/schema/Entity.json | 35 +++ .../resources/schema/ExecutionEnvironment.json | 115 +++++++++ .../src/main/resources/schema/Glue2.json | 246 +++++++++++++++++++ .../src/main/resources/schema/Location.json | 47 ++++ .../src/main/resources/schema/Manager.json | 28 +++ .../main/resources/schema/MappingPolicy.json | 13 + .../src/main/resources/schema/Policy.json | 27 ++ .../src/main/resources/schema/Resource.json | 27 ++ .../src/main/resources/schema/Service.json | 75 ++++++ .../src/main/resources/schema/Share.json | 45 ++++ .../resources/schema/StorageAccessProtocol.json | 32 +++ .../main/resources/schema/StorageEndpoint.json | 8 + .../main/resources/schema/StorageManager.json | 8 + .../main/resources/schema/StorageService.json | 22 ++ .../schema/StorageServiceCapacity.json | 33 +++ .../src/main/resources/schema/StorageShare.json | 65 +++++ .../resources/schema/StorageShareCapacity.json | 33 +++ .../resources/schema/ToComputingService.json | 32 +++ .../main/resources/schema/ToStorageService.json | 25 ++ .../src/main/resources/schema/UserDomain.json | 58 +++++ .../airavata/common/utils/AiravataUtils.java | 16 ++ modules/distribution/airavata-server/pom.xml | 5 + .../src/main/assembly/bin-assembly.xml | 1 + .../gfac/provider/impl/GSISSHProvider.java | 9 +- .../server/OrchestratorServerHandler.java | 20 +- .../src/test/resources/registry-derby.sql | 15 +- .../persistance/registry/jpa/ResourceType.java | 1 + .../registry/jpa/impl/ExperimentRegistry.java | 113 +++++---- .../registry/jpa/impl/ProjectRegistry.java | 211 ++++++++++++++++ .../registry/jpa/impl/RegistryImpl.java | 30 ++- .../persistance/registry/jpa/model/Project.java | 23 ++ .../registry/jpa/model/ProjectUser.java | 77 ++++++ .../registry/jpa/model/ProjectUser_PK.java | 62 +++++ .../jpa/resources/AbstractResource.java | 7 + .../jpa/resources/ExperimentResource.java | 4 +- .../registry/jpa/resources/ProjectResource.java | 87 ++++++- .../jpa/resources/ProjectUserResource.java | 109 ++++++++ .../jpa/resources/TaskDetailResource.java | 2 +- .../registry/jpa/resources/Utils.java | 18 ++ .../jpa/utils/ThriftDataModelConversion.java | 28 ++- .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/registry-derby.sql | 13 +- .../src/main/resources/registry-mysql.sql | 13 +- .../src/test/resources/registry-derby.sql | 13 +- .../airavata/registry/cpi/utils/Constants.java | 5 + .../gsi/ssh/api/job/SlurmJobConfiguration.java | 2 +- .../gsi/ssh/api/job/SlurmOutputParser.java | 5 +- 73 files changed, 2926 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/f9b95c93/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml ----------------------------------------------------------------------
