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/86f46412 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/86f46412 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/86f46412 Branch: refs/heads/master Commit: 86f46412e885b70594a6d9ce22fe266ad0f5f892 Parents: 7ec932b 79750b7 Author: lahiru <[email protected]> Authored: Tue May 6 13:43:01 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue May 6 13:43:01 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 2 +- .../api/server/util/RegistryInitUtil.java | 1 + .../src/main/resources/registry-derby.sql | 15 +++++---- .../src/main/resources/registry-mysql.sql | 13 ++++---- .../client/samples/CreateLaunchExperiment.java | 21 +++++++++--- .../samples/CreateLaunchExperimentUS3.java | 24 ++++++++++---- .../airavata/model/util/ProjectModelUtil.java | 14 ++++++++ .../apache/airavata/integration/BaseCaseIT.java | 12 +++++-- .../airavata/integration/DataRetrievalIT.java | 32 ++++++++++++------ .../airavata/integration/SimpleEchoIT.java | 7 +++- .../orchestrator/client/util/Initialize.java | 1 + .../src/test/resources/registry-derby.sql | 15 +++++---- .../client/sample/OrchestratorClientSample.java | 2 +- .../orchestrator/core/NewOrchestratorTest.java | 2 +- .../core/OrchestratorTestWithMyProxyAuth.java | 2 +- .../orchestrator/core/util/Initialize.java | 1 + .../src/test/resources/registry-derby.sql | 15 +++++---- .../registry/jpa/impl/ExperimentRegistry.java | 28 ++++++++-------- .../registry/jpa/impl/ProjectRegistry.java | 30 ++++++++++------- .../registry/jpa/model/Experiment.java | 14 ++++---- .../persistance/registry/jpa/model/Project.java | 11 +++++++ .../registry/jpa/model/ProjectUser.java | 14 ++++---- .../registry/jpa/model/ProjectUser_PK.java | 14 ++++---- .../jpa/resources/AbstractResource.java | 5 +-- .../jpa/resources/ExperimentResource.java | 2 +- .../registry/jpa/resources/ProjectResource.java | 29 +++++++++++------ .../jpa/resources/ProjectUserResource.java | 18 +++++------ .../registry/jpa/resources/Utils.java | 6 ++-- .../registry/jpa/resources/WorkerResource.java | 34 ++++++++++++-------- .../jpa/utils/ThriftDataModelConversion.java | 4 +-- .../src/main/resources/registry-derby.sql | 15 +++++---- .../src/main/resources/registry-mysql.sql | 13 ++++---- .../registry/jpa/AbstractResourceTest.java | 2 +- .../registry/jpa/GatewayResourceTest.java | 1 + .../registry/jpa/util/Initialize.java | 2 ++ .../src/test/resources/registry-derby.sql | 15 +++++---- .../airavata/registry/cpi/utils/Constants.java | 2 +- 37 files changed, 275 insertions(+), 163 deletions(-) ----------------------------------------------------------------------
