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/4adcce98 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4adcce98 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4adcce98 Branch: refs/heads/master Commit: 4adcce9866c8e32f13e782d1ef3a62c2d4a7bd2c Parents: 6c500f2 6821ce1 Author: raminder <[email protected]> Authored: Thu Aug 28 11:21:31 2014 -0400 Committer: raminder <[email protected]> Committed: Thu Aug 28 11:21:31 2014 -0400 ---------------------------------------------------------------------- .../catalog/data/model/Configuration.java | 57 +++++++++++++++++ .../catalog/data/model/Configuration_PK.java | 65 ++++++++++++++++++++ .../catalog/data/util/AppCatalogJPAUtils.java | 7 ++- .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 11 ++++ .../src/main/resources/appcatalog-mysql.sql | 9 +++ .../src/test/resources/appcatalog-derby.sql | 11 ++++ .../main/resources/airavata-server.properties | 2 +- .../main/resources/airavata-server.properties | 2 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 9 ++- .../impl/pull/qstat/ResourceConnection.java | 5 ++ .../persistance/registry/jpa/ResourceUtils.java | 4 +- 12 files changed, 174 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
