You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/05/26 05:44:01 UTC
airavata git commit: Removing the legacy server vs client mode -
AIRAVATA-1701
Repository: airavata
Updated Branches:
refs/heads/master 86994f641 -> a23a9cc01
Removing the legacy server vs client mode - AIRAVATA-1701
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a23a9cc0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a23a9cc0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a23a9cc0
Branch: refs/heads/master
Commit: a23a9cc01587d3326a3119a8b201fcd6c7d33f1d
Parents: 86994f6
Author: Suresh Marru <sm...@apache.org>
Authored: Mon May 25 23:43:54 2015 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon May 25 23:43:54 2015 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 1 -
.../api/server/AiravataDerbyServer.java | 1 -
.../handler/AiravataServerHandlerTest.java | 1 -
.../app/catalog/test/AppDeploymentTest.java | 1 -
.../app/catalog/test/AppInterfaceTest.java | 1 -
.../app/catalog/test/ComputeResourceTest.java | 1 -
.../app/catalog/test/GatewayProfileTest.java | 1 -
.../airavata/common/utils/AiravataUtils.java | 28 --------------------
.../common/utils/ApplicationSettings.java | 9 +------
.../common/utils/ApplicationSettingsTest.java | 1 -
.../servlet/CredentialStoreCallbackServlet.java | 1 -
.../store/store/impl/db/SSHCredentialTest.java | 1 -
.../credential/store/client/TestSSLClient.java | 1 -
.../airavata/gfac/client/util/Initialize.java | 1 -
.../apache/airavata/job/GFacConfigXmlTest.java | 2 --
.../GSISecurityContextTestWithMyProxyAuth.java | 1 -
.../messaging/client/RabbitMQListener.java | 1 -
.../airavata/messaging/core/TestClient.java | 1 -
.../orchestrator/client/util/Initialize.java | 1 -
.../orchestrator/core/util/Initialize.java | 1 -
.../registry/jpa/util/Initialize.java | 1 -
.../org/apache/airavata/server/ServerMain.java | 1 -
.../multitenantedairavata/GatewayRegister.java | 1 -
23 files changed, 1 insertion(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
index 6da9ac9..8402a6f 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
@@ -64,7 +64,6 @@ public class AiravataAPIServer implements IServer{
public void startAiravataServer(Airavata.Processor<Airavata.Iface> airavataAPIServer) throws AiravataSystemException {
try {
- AiravataUtils.setExecutionAsServer();
RegistryInitUtil.initializeDB();
AppCatalogInitUtil.initializeDB();
final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_PORT,"8930"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataDerbyServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataDerbyServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataDerbyServer.java
index 5c9522d..77b47bc 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataDerbyServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataDerbyServer.java
@@ -98,7 +98,6 @@ public class AiravataDerbyServer implements IServer{
}
public void startDerbyServer() throws AiravataSystemException {
- AiravataUtils.setExecutionAsServer();
startDerbyServer();
setStatus(ServerStatus.STARTED);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/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 1094563..c3154a6 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
@@ -48,7 +48,6 @@ public class AiravataServerHandlerTest {
@BeforeClass
public static void setupBeforeClass() throws Exception{
- AiravataUtils.setExecutionAsServer();
RegistryInitUtil.initializeDB();
airavataServerHandler = new AiravataServerHandler();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
index 0040770..62ad814 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
@@ -52,7 +52,6 @@ public class AppDeploymentTest {
@Before
public void setUp() {
try {
- AiravataUtils.setExecutionAsServer();
initialize = new Initialize("appcatalog-derby.sql");
initialize.initializeDB();
appcatalog = AppCatalogFactory.getAppCatalog();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
index 6ac4d81..dd72b8e 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
@@ -57,7 +57,6 @@ public class AppInterfaceTest {
@Before
public void setUp() {
try {
- AiravataUtils.setExecutionAsServer();
initialize = new Initialize("appcatalog-derby.sql");
initialize.initializeDB();
appcatalog = AppCatalogFactory.getAppCatalog();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
index 651f03e..9b8ec4b 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
@@ -48,7 +48,6 @@ public class ComputeResourceTest {
@Before
public void setUp() {
try {
- AiravataUtils.setExecutionAsServer();
initialize = new Initialize("appcatalog-derby.sql");
initialize.initializeDB();
appcatalog = AppCatalogFactory.getAppCatalog();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/GatewayProfileTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/GatewayProfileTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/GatewayProfileTest.java
index 02b4a01..b2b8555 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/GatewayProfileTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/GatewayProfileTest.java
@@ -52,7 +52,6 @@ public class GatewayProfileTest {
@Before
public void setUp() {
try {
- AiravataUtils.setExecutionAsServer();
initialize = new Initialize("appcatalog-derby.sql");
initialize.initializeDB();
appcatalog = AppCatalogFactory.getAppCatalog();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
----------------------------------------------------------------------
diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
index 99b600f..52d114f 100644
--- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
+++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
@@ -26,34 +26,6 @@ import java.util.Calendar;
import java.util.UUID;
public class AiravataUtils {
- public static final String EXECUTION_MODE="application.execution.mode";
- public static void setExecutionMode(ExecutionMode mode){
- System.setProperty(EXECUTION_MODE, mode.name());
- }
-
- public static ExecutionMode getExecutionMode(){
- if (System.getProperties().containsKey(EXECUTION_MODE)) {
- return ExecutionMode.valueOf(System.getProperty(EXECUTION_MODE));
- }else{
- return ExecutionMode.CLIENT;
- }
- }
-
- public static boolean isServer(){
- return getExecutionMode()==ExecutionMode.SERVER;
- }
-
- public static boolean isClient(){
- return getExecutionMode()==ExecutionMode.CLIENT;
- }
-
- public static void setExecutionAsServer(){
- setExecutionMode(ExecutionMode.SERVER);
- }
-
- public static void setExecutionAsClient(){
- setExecutionMode(ExecutionMode.CLIENT);
- }
public static Timestamp getCurrentTimestamp() {
Calendar calender = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index cec498f..9a59573 100644
--- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -42,7 +42,6 @@ import org.slf4j.LoggerFactory;
public class ApplicationSettings {
public static final String SERVER_PROPERTIES="airavata-server.properties";
- public static final String CLIENT_PROPERTIES="airavata-client.properties";
public static String ADDITIONAL_SETTINGS_FILES = "external.settings";
@@ -85,13 +84,7 @@ public class ApplicationSettings {
}
protected URL getPropertyFileURL() {
- URL url;
- if (AiravataUtils.isClient()){
- url=ApplicationSettings.class.getClassLoader().getResource(CLIENT_PROPERTIES);
- }else{
- url=ApplicationSettings.class.getClassLoader().getResource(SERVER_PROPERTIES);
- }
- return url;
+ return ApplicationSettings.class.getClassLoader().getResource(SERVER_PROPERTIES);
}
protected URL[] getExternalSettingsFileURLs(){
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
----------------------------------------------------------------------
diff --git a/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java b/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
index 4ade721..ed61793 100644
--- a/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
+++ b/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java
@@ -34,7 +34,6 @@ public class ApplicationSettingsTest extends TestCase {
public void testGetAbsoluteSettingWithSpecialCharacters() throws Exception {
- System.setProperty(AiravataUtils.EXECUTION_MODE, "SERVER");
String url = ServerSettings.getSetting("default.registry.user");
Assert.assertEquals("admin", url);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
index 66d4be7..72211fa 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
@@ -70,7 +70,6 @@ public class CredentialStoreCallbackServlet extends ClientServlet {
DBUtil dbUtil;
try {
- AiravataUtils.setExecutionAsServer();
dbUtil = DBUtil.getCredentialStoreDBUtil();
} catch (Exception e) {
throw new ServletException("Error initializing database operations.", e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
index b5eceed..e5fed60 100644
--- a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
+++ b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
@@ -47,7 +47,6 @@ public class SSHCredentialTest {
String pubKeyPath = "/Users/chathuri/Desktop/ssh_gw111/id_rsa.pub";
try {
- AiravataUtils.setExecutionAsServer();
DBUtil dbUtil = new DBUtil(jdbcURL, userName, password, jdbcDriver);
SSHCredentialWriter writer = new SSHCredentialWriter(dbUtil);
SSHCredential sshCredential = new SSHCredential();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
index 1d9f4d9..2c93c71 100644
--- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
+++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
@@ -50,7 +50,6 @@ public class TestSSLClient {
private void invoke() {
TTransport transport;
try {
- AiravataUtils.setExecutionAsServer();
TSSLTransportFactory.TSSLTransportParameters params =
new TSSLTransportFactory.TSSLTransportParameters();
String keystorePath = ServerSettings.getCredentialStoreThriftServerKeyStorePath();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java b/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
index e4525d0..6f3f792 100644
--- a/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
+++ b/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
@@ -96,7 +96,6 @@ public class Initialize {
String jdbcUser = null;
String jdbcPassword = null;
try{
- AiravataUtils.setExecutionAsServer();
jdbcUrl = ServerSettings.getSetting("registry.jdbc.url");
jdbcUser = ServerSettings.getSetting("registry.jdbc.user");
jdbcPassword = ServerSettings.getSetting("registry.jdbc.password");
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
index 507ab9e..05e25d1 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
@@ -50,7 +50,6 @@ public class GFacConfigXmlTest {
public void testGFacConfigWithHost(){
Assert.assertNotNull(gfac.getGfacConfigFile());
Assert.assertEquals(1,gfac.getDaemonHandlers().size());
- AiravataUtils.setExecutionAsServer();
try {
JobExecutionContext jec = new JobExecutionContext(GFacConfiguration.create(gfac.getGfacConfigFile(), null), "testService");
ApplicationContext applicationContext = new ApplicationContext();
@@ -95,7 +94,6 @@ public class GFacConfigXmlTest {
public void testAppSpecificConfig() {
Assert.assertNotNull(gfac.getGfacConfigFile());
Assert.assertEquals(1, gfac.getDaemonHandlers().size());
- AiravataUtils.setExecutionAsServer();
try {
JobExecutionContext jec = new JobExecutionContext(GFacConfiguration.create(gfac.getGfacConfigFile(), null), "UltraScan");
ApplicationContext applicationContext = new ApplicationContext();
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java b/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
index 44b7ae4..9268d84 100644
--- a/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
+++ b/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
@@ -47,7 +47,6 @@ public class GSISecurityContextTestWithMyProxyAuth extends DatabaseTestCases {
@BeforeClass
public static void setUpClass() throws Exception {
- AiravataUtils.setExecutionAsServer();
// System.setProperty("myproxy.username", "ogce");
// System.setProperty("myproxy.password", "");
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
----------------------------------------------------------------------
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
index 3f876ae..b22e5cb 100644
--- a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
+++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
@@ -61,7 +61,6 @@ public class RabbitMQListener {
try {
FileOutputStream fos = new FileOutputStream(file, false);
final BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fos));
- AiravataUtils.setExecutionAsServer();
String brokerUrl = ServerSettings.getSetting(RABBITMQ_BROKER_URL);
System.out.println("broker url " + brokerUrl);
final String exchangeName = ServerSettings.getSetting(RABBITMQ_EXCHANGE_NAME);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
index aea561f..89fe7ce 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
@@ -47,7 +47,6 @@ public class TestClient {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsServer();
String brokerUrl = ServerSettings.getSetting(RABBITMQ_BROKER_URL);
final String exchangeName = ServerSettings.getSetting(RABBITMQ_EXCHANGE_NAME);
RabbitMQStatusConsumer consumer = new RabbitMQStatusConsumer(brokerUrl, exchangeName);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java
index 2be31e6..a9eb5a8 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java
@@ -96,7 +96,6 @@ public class Initialize {
String jdbcUser = null;
String jdbcPassword = null;
try{
- AiravataUtils.setExecutionAsServer();
jdbcUrl = ServerSettings.getSetting("registry.jdbc.url");
jdbcUser = ServerSettings.getSetting("registry.jdbc.user");
jdbcPassword = ServerSettings.getSetting("registry.jdbc.password");
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/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 2dc59a0..29a8f2c 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
@@ -96,7 +96,6 @@ public class Initialize {
String jdbcUser = null;
String jdbcPassword = null;
try{
- AiravataUtils.setExecutionAsServer();
jdbcUrl = ServerSettings.getSetting("registry.jdbc.url");
jdbcUser = ServerSettings.getSetting("registry.jdbc.user");
jdbcPassword = ServerSettings.getSetting("registry.jdbc.password");
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
index e362d6f..6bb5a5e 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
@@ -100,7 +100,6 @@ public class Initialize {
String jdbcUser = null;
String jdbcPassword = null;
try{
- AiravataUtils.setExecutionAsServer();
jdbcUrl = ServerSettings.getSetting("registry.jdbc.url");
jdbcUser = ServerSettings.getSetting("registry.jdbc.user");
jdbcPassword = ServerSettings.getSetting("registry.jdbc.password");
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index fdf1660..d90c21b 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -120,7 +120,6 @@ public class ServerMain {
// if (true){
// return;
// }
- AiravataUtils.setExecutionAsServer();
CommandLineParameters commandLineParameters = StringUtil.getCommandLineParser(args);
if (commandLineParameters.getArguments().contains(STOP_COMMAND_STR)){
performServerStopRequest(commandLineParameters);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a23a9cc0/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/GatewayRegister.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/GatewayRegister.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/GatewayRegister.java
index ebf1c80..a028799 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/GatewayRegister.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/GatewayRegister.java
@@ -128,7 +128,6 @@ public class GatewayRegister {
PrintWriter tokenWriter = new PrintWriter(fileName, "UTF-8");
// credential store related functions are not in the current api, so need to call credential store directly
- AiravataUtils.setExecutionAsClient();
String jdbcURL = propertyReader.readProperty(TestFrameworkConstants.AiravataClientConstants.CS_JBDC_URL, PropertyFileType.AIRAVATA_CLIENT);
String jdbcDriver = propertyReader.readProperty(TestFrameworkConstants.AiravataClientConstants.CS_JBDC_DRIVER, PropertyFileType.AIRAVATA_CLIENT);
String userName = propertyReader.readProperty(TestFrameworkConstants.AiravataClientConstants.CS_DB_USERNAME, PropertyFileType.AIRAVATA_CLIENT);