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/11191ef4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/11191ef4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/11191ef4 Branch: refs/heads/master Commit: 11191ef46e91fddf108cf98e18288a2a4996a911 Parents: 3c3040d 5dd4019 Author: lahiru <[email protected]> Authored: Thu Feb 13 11:01:28 2014 -0500 Committer: lahiru <[email protected]> Committed: Thu Feb 13 11:01:28 2014 -0500 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 10 + .../airavata/api/server/AiravataServer.java | 6 +- .../api/server/util/ConnectionPool.java | 381 +++++++++++++++++++ .../api/server/util/DatabaseCreator.java | 340 +++++++++++++++++ .../airavata/api/server/util/JdbcStorage.java | 177 +++++++++ .../api/server/util/OrchestratorInitUtil.java | 25 ++ .../api/server/util/RegistryInitUtil.java | 173 +++++++++ .../main/resources/airavata-registry-derby.sql | 325 ++++++++++++++++ .../main/resources/airavata-registry-mysql.sql | 327 ++++++++++++++++ .../main/resources/airavata-server.properties | 30 +- .../experimentModel.thrift | 40 ++ .../registry/jpa/impl/RegistryImpl.java | 39 +- .../apache/airavata/registry/cpi/Registry.java | 14 +- 13 files changed, 1857 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
