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/fc64bd05 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fc64bd05 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fc64bd05 Branch: refs/heads/master Commit: fc64bd0510bad08c3ee0a2dca9de33c4f62d7684 Parents: 4c50cab 4c6f73d Author: lahiru <[email protected]> Authored: Tue Mar 11 14:54:57 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue Mar 11 14:54:57 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 | 20 ++ .../main/resources/airavata-client.properties | 4 +- .../airavata/client/tools/DocumentCreator.java | 6 - .../airavata/common/utils/AiravataUtils.java | 16 ++ .../src/test/resources/registry-derby.sql | 15 +- .../persistance/registry/jpa/ResourceType.java | 1 + .../registry/jpa/impl/ExperimentRegistry.java | 67 +++--- .../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 + .../registry/jpa/resources/ProjectResource.java | 87 +++++++- .../jpa/resources/ProjectUserResource.java | 109 ++++++++++ .../registry/jpa/resources/Utils.java | 18 ++ .../jpa/utils/ThriftDataModelConversion.java | 22 ++ .../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 + 26 files changed, 823 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
