You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/06/09 18:08:25 UTC
airavata git commit: fixing test failures
Repository: airavata
Updated Branches:
refs/heads/master 80a1dd315 -> c75d40685
fixing test failures
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c75d4068
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c75d4068
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c75d4068
Branch: refs/heads/master
Commit: c75d4068519dde12d79978323220fa59e29e5c9f
Parents: 80a1dd3
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Jun 9 12:08:19 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Jun 9 12:08:19 2015 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandlerTest.java | 2 +-
.../org/apache/airavata/orchestrator/core/util/Initialize.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c75d4068/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
index b67a3f8..dad2ef7 100644
--- a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
+++ b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
@@ -52,7 +52,7 @@ public class AiravataServerHandlerTest {
public static void setupBeforeClass() throws Exception{
AppCatInit appCatInit = new AppCatInit("appcatalog-derby.sql");
appCatInit.initializeDB();
- ExpCatInit expCatInit = new ExpCatInit("appcatalog-derby.sql");
+ ExpCatInit expCatInit = new ExpCatInit("expcatalog-derby.sql");
expCatInit.initializeDB();
airavataServerHandler = new AiravataServerHandler();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c75d4068/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
index 4c5c219..ada0c99 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
@@ -23,8 +23,8 @@ package org.apache.airavata.orchestrator.core.util;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.experiment.catalog.ResourceType;
-import org.apache.airavata.experiment.catalog.resources.*;
+import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
+import org.apache.airavata.registry.core.experiment.catalog.resources.*;
import org.apache.airavata.registry.cpi.RegistryException;
import org.apache.derby.drda.NetworkServerControl;
import org.slf4j.Logger;