You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/07/23 20:23:29 UTC
[5/7] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
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/c61d438c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c61d438c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c61d438c
Branch: refs/heads/master
Commit: c61d438ca2f5c285c70fe4e088cc1f9c086f7cb2
Parents: d9d3546 88269c4
Author: lahiru <la...@apache.org>
Authored: Wed Jul 23 12:25:50 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Wed Jul 23 12:25:50 2014 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 36 +-
.../data/impl/ApplicationDeploymentImpl.java | 2 +-
.../app/catalog/test/AppDeploymentTest.java | 1 +
.../src/test/resources/registry-derby.sql | 35 -
.../src/test/resources/registry-derby.sql | 35 -
.../src/test/resources/registry-derby.sql | 35 -
.../persistance/registry/jpa/ResourceType.java | 3 -
.../registry/jpa/impl/AiravataJPARegistry.java | 682 +++++++++----------
.../jpa/model/Application_Descriptor.java | 110 ---
.../jpa/model/Application_Descriptor_PK.java | 65 --
.../registry/jpa/model/Host_Descriptor.java | 88 ---
.../registry/jpa/model/Host_Descriptor_PK.java | 64 --
.../registry/jpa/model/Service_Descriptor.java | 90 ---
.../jpa/model/Service_Descriptor_PK.java | 64 --
.../jpa/resources/AbstractResource.java | 29 -
.../ApplicationDescriptorResource.java | 283 --------
.../registry/jpa/resources/GatewayResource.java | 333 ---------
.../jpa/resources/HostDescriptorResource.java | 257 -------
.../resources/ServiceDescriptorResource.java | 185 -----
.../registry/jpa/resources/Utils.java | 81 ---
.../src/main/resources/META-INF/persistence.xml | 3 -
.../src/main/resources/registry-derby.sql | 35 -
.../src/main/resources/registry-mysql.sql | 35 -
.../jpa/ApplicationDescriptorResourceTest.java | 58 --
.../registry/jpa/GatewayResourceTest.java | 44 --
.../jpa/HostDescriptorResourceTest.java | 59 --
.../jpa/ServiceDescriptorResourceTest.java | 59 --
.../src/test/resources/registry-derby.sql | 35 -
28 files changed, 361 insertions(+), 2445 deletions(-)
----------------------------------------------------------------------