Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b09ce0cf Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b09ce0cf Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b09ce0cf Branch: refs/heads/master Commit: b09ce0cf9a4c59e1a17d21b9deeec76d6e0a7112 Parents: 48e2593 f22acb8 Author: smarru <[email protected]> Authored: Wed Feb 24 12:02:42 2016 -0500 Committer: smarru <[email protected]> Committed: Wed Feb 24 12:02:42 2016 -0500 ---------------------------------------------------------------------- .../airavata/api/server/AiravataAPIServer.java | 10 +- .../server/util/CredentialStoreInitUtil.java | 156 +++++++++++++++++++ .../scripts/credential-store-h2.sql | 42 ----- .../scripts/credential-store-mysql.sql | 38 ----- .../src/main/resources/credstore-derby.sql | 39 +++++ .../src/main/resources/credstore-mysql.sql | 39 +++++ .../src/main/resources/expcatalog-derby.sql | 21 +-- .../src/main/resources/expcatalog-mysql.sql | 21 +-- 8 files changed, 242 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
