Fixed merge confilcts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/01716e53 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/01716e53 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/01716e53 Branch: refs/heads/lahiru/AIRAVATA-2057 Commit: 01716e5360417926a32cf1e4e1aef441c4b939d7 Parents: 54f5c34 b9b2480 Author: Shameera Rathnayaka <[email protected]> Authored: Thu Aug 11 15:06:52 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Thu Aug 11 15:06:52 2016 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 7 +- .../airavata/api/server/AiravataAPIServer.java | 16 +- .../server/handler/AiravataServerHandler.java | 40 +- .../DefaultAiravataSecurityManager.java | 29 +- .../util/AiravataServerThreadPoolExecutor.java | 55 --- .../api/server/util/AppCatalogInitUtil.java | 168 -------- .../api/server/util/ConnectionPool.java | 383 ------------------- .../server/util/CredentialStoreInitUtil.java | 156 -------- .../api/server/util/DataModelUtils.java | 56 --- .../api/server/util/DatabaseCreator.java | 353 ----------------- .../server/util/ExperimentCatalogInitUtil.java | 203 ---------- .../airavata/api/server/util/JdbcStorage.java | 176 --------- .../api/server/util/OrchestratorInitUtil.java | 25 -- .../api/server/util/ReplicaCatalogInitUtil.java | 160 -------- .../server/util/WorkflowCatalogInitUtil.java | 162 -------- .../api/server/handler/utils/AppCatInit.java | 320 ---------------- .../api/server/handler/utils/ExpCatInit.java | 330 ---------------- .../server/handler/utils/ReplicaCatInit.java | 315 --------------- 18 files changed, 26 insertions(+), 2928 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/01716e53/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ----------------------------------------------------------------------
