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/0c58b97e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0c58b97e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0c58b97e
Branch: refs/heads/master
Commit: 0c58b97e05dd2f0c9760eb4a265558c43c4e8f79
Parents: f8c7451 757fbb6
Author: lahiru <lahiru@apache.org>
Authored: Fri Feb 21 11:59:03 2014 -0500
Committer: lahiru <lahiru@apache.org>
Committed: Fri Feb 21 11:59:03 2014 -0500
----------------------------------------------------------------------
airavata-api/airavata-api-stubs/pom.xml | 5 +
.../generate-cpi-stubs.sh | 133 +
.../cpi-thrift-descriptions/registryCPI.thrift | 94 +
.../airavata/registry/cpi/ChildDataType.java | 106 +
.../apache/airavata/registry/cpi/DataType.java | 121 +
.../airavata/registry/cpi/ParentDataType.java | 70 +
.../registry/cpi/RegistryCPIService.java | 2797 ++++++++++++++++++
.../registry/cpi/registryCPIConstants.java | 55 +
modules/gfac/gfac-core/pom.xml | 5 +
modules/registry/airavata-jpa-registry/pom.xml | 5 +
.../persistance/registry/jpa/ResourceUtils.java | 65 +-
.../registry/jpa/impl/ExperimentRegistry.java | 753 ++---
.../registry/jpa/impl/RegistryImpl.java | 51 +-
.../persistance/registry/jpa/impl/UserReg.java | 6 +-
.../registry/jpa/model/Experiment.java | 8 -
.../jpa/resources/AbstractResource.java | 24 +-
.../resources/DataTransferDetailResource.java | 12 +
.../jpa/resources/ExperimentResource.java | 24 +-
.../registry/jpa/resources/GatewayResource.java | 17 +-
.../registry/jpa/resources/UserResource.java | 34 -
.../registry/jpa/resources/Utils.java | 4 +-
.../jpa/utils/ThriftDataModelConversion.java | 108 +-
.../src/main/resources/META-INF/persistence.xml | 2 +-
.../src/main/resources/registry-derby.sql | 21 +-
.../registry/jpa/AbstractResourceTest.java | 23 +-
.../jpa/ExecutionErrorResourceTest.java | 190 +-
.../jpa/ExperimentInputResourceTest.java | 122 +-
.../jpa/ExperimentMetadataResourceTest.java | 174 +-
.../registry/jpa/ExperimentResourceTest.java | 153 +-
.../registry/jpa/GFacJobDataResourceTest.java | 154 +-
.../registry/jpa/GFacJobStatusResourceTest.java | 174 +-
.../registry/jpa/GatewayResourceTest.java | 362 +--
.../registry/jpa/GramDataResourceTest.java | 144 +-
.../registry/jpa/NodeDataResourceTest.java | 144 +-
.../jpa/OrchestratorDataResourceTest.java | 98 +-
.../registry/jpa/ProjectResourceTest.java | 81 -
.../registry/jpa/WorkerResourceTest.java | 220 +-
.../registry/jpa/WorkflowDataResourceTest.java | 212 +-
.../registry/jpa/util/Initialize.java | 7 +-
.../test/resources/airavata-registry-derby.sql | 353 ++-
.../src/test/resources/registry-derby.sql | 376 +++
.../apache/airavata/registry/cpi/Registry.java | 20 +-
.../airavata/registry/cpi/utils/Constants.java | 4 +-
43 files changed, 5715 insertions(+), 1816 deletions(-)
----------------------------------------------------------------------
|