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 2013/11/15 15:41:52 UTC

svn commit: r1542277 - in /airavata/trunk: modules/airavata-client/src/main/java/org/apache/airavata/client/ modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ modules/airavata-client/src/main/resources/ modules/airavata-client/src/...

Author: chathuri
Date: Fri Nov 15 14:41:51 2013
New Revision: 1542277

URL: http://svn.apache.org/r1542277
Log:
allowing thrift impl class configurable using the client properties

Modified:
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerThriftImpl.java
    airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
    airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
    airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
    airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
    airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
    airavata/trunk/modules/gfac-core/pom.xml
    airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties
    airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties
    airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties
    airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-client.properties
    airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties
    airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties
    airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties
    airavata/trunk/samples/sample-gateway/src/main/resources/airavata-client.properties

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java Fri Nov 15 14:41:51 2013
@@ -44,6 +44,7 @@ import org.apache.airavata.client.impl.*
 import org.apache.airavata.common.exception.AiravataConfigurationException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.ApplicationSettings;
+import org.apache.airavata.common.utils.ClientSettings;
 import org.apache.airavata.common.utils.Version;
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.AiravataRegistryFactory;
@@ -73,6 +74,7 @@ public class AiravataClient extends Obse
 	public static final String WITHLISTENER = "with.Listener";
 	public static final String WORKFLOWSERVICEURL = "xbaya.service.url";
 	public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
+	public static final String EXECUTION_CLASS_IMPL = "class.execution.service.impl";
 	private AiravataClientConfiguration clientConfiguration;
 	private String currentUser;
 	private URI regitryURI;
@@ -87,7 +89,7 @@ public class AiravataClient extends Obse
 	private ProvenanceManagerImpl provenanceManagerImpl;
 	private UserManagerImpl userManagerImpl;
 //	private ExecutionManagerThriftImpl executionManagerImpl;
-    private ExecutionManagerImpl executionManagerImpl;
+    private ExecutionManager executionManager;
 	private String gateway;
 	private boolean configCreated = false;
 
@@ -347,13 +349,41 @@ public class AiravataClient extends Obse
 	}
 
 	public ExecutionManager getExecutionManager() {
-		if (executionManagerImpl == null) {
-//			executionManagerImpl = new ExecutionManagerThriftImpl(this);
-			executionManagerImpl = new ExecutionManagerImpl(this);
-		}
-		return executionManagerImpl;
+        try{
+            String executionImplClass = ClientSettings.getSetting(EXECUTION_CLASS_IMPL);
+            if (executionImplClass == null){
+                throw new ApplicationSettingsException("Execution impl class not defined in client properties");
+            } else {
+                executionManager = getExecutionManagerObj(executionImplClass);
+                if (executionManager instanceof ExecutionManagerImpl){
+                    ((ExecutionManagerImpl) executionManager).setClient(this);
+                }else if (executionManager instanceof  ExecutionManagerThriftImpl){
+                    ((ExecutionManagerThriftImpl) executionManager).setClient(this);
+                }
+            }
+        } catch (ApplicationSettingsException e) {
+            log.error("Error while reading airavata client properties", e);
+        } catch (ClassNotFoundException e) {
+            log.error("Execution Impl class not found", e);
+        } catch (InstantiationException e) {
+            log.error("Unable to instantiate Execution impl class", e);
+        } catch (IllegalAccessException e) {
+            log.error("Illegal access of the execution impl class", e);
+        }
+        if (executionManager == null){
+            executionManager = new ExecutionManagerImpl(this);
+        }
+		return executionManager;
 	}
 
+    private ExecutionManager getExecutionManagerObj(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        Class<?> cls = Class.forName(className);
+        if (!ExecutionManager.class.isAssignableFrom(cls)) {
+            throw new IllegalArgumentException();
+        }
+        return (ExecutionManager) cls.newInstance();
+    }
+
 	public String getCurrentUser() {
 		return currentUser;
 	}

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java Fri Nov 15 14:41:51 2013
@@ -63,7 +63,10 @@ import org.apache.axis2.AxisFault;
 public class ExecutionManagerImpl implements ExecutionManager {
 	private AiravataClient client;
 
-	public ExecutionManagerImpl(AiravataClient client) {
+    public ExecutionManagerImpl() {
+    }
+
+    public ExecutionManagerImpl(AiravataClient client) {
 		setClient(client);
 	}
 

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerThriftImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerThriftImpl.java?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerThriftImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerThriftImpl.java Fri Nov 15 14:41:51 2013
@@ -47,6 +47,9 @@ import java.util.*;
 public class ExecutionManagerThriftImpl implements ExecutionManager {
     private AiravataClient client;
 
+    public ExecutionManagerThriftImpl() {
+    }
+
     public ExecutionManagerThriftImpl(AiravataClient client) {
         setClient(client);
     }

Modified: airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -71,3 +71,13 @@ xbaya.registry.user=admin
 xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
+
+
+

Modified: airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -61,3 +61,10 @@ trust.store.password=airavata
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file

Modified: airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties Fri Nov 15 14:41:51 2013
@@ -221,3 +221,8 @@ class.registry.accessor=org.apache.airav
 #enable.application.job.status.history=true
 registry.service.wsdl=http://${ip}:${port}/airavata-server/services/RegistryService?wsdl
 registry.service.wsdl2=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
\ No newline at end of file

Modified: airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties (original)
+++ airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -71,4 +71,7 @@ trust.store.password=airavata
 ###################################################################################
 # Thrift configuration
 ###################################################################################
-thrift.server.port=6060
\ No newline at end of file
+thrift.server.port=6060
+
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file

Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -68,3 +68,6 @@ trust.store.password=airavata
 # Thrift configuration
 ###################################################################################
 thrift.server.port=6060
+
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl

Modified: airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/pom.xml?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac-core/pom.xml Fri Nov 15 14:41:51 2013
@@ -109,13 +109,13 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.1</version>
+            <version>4.3</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.1</version>
+            <version>4.3</version>
             <type>jar</type>
         </dependency>
 

Modified: airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -64,3 +64,10 @@ trust.store.password=airavata
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file

Modified: airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties Fri Nov 15 14:41:51 2013
@@ -229,3 +229,7 @@ class.registry.accessor=org.apache.airav
 #http://localhost:8080/axis2/services/RegistryService?wsdl
 registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
\ No newline at end of file

Modified: airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -64,3 +64,10 @@ trust.store.password=airavata
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java Fri Nov 15 14:41:51 2013
@@ -94,6 +94,7 @@ public class ExperimentDataRetriever {
         } catch (ClassNotFoundException e) {
             logger.error(e.getMessage(), e);
         } catch (SQLException e){
+            logger.error(e.getMessage());
         }catch (ParseException e) {
             logger.error(e.getMessage(), e);
         } catch (ExperimentLazyLoadedException e) {
@@ -559,4 +560,4 @@ public class ExperimentDataRetriever {
     }
 
 	
-}
+}

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -62,3 +62,11 @@ trust.store.password=airavata
 #class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file

Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -61,3 +61,11 @@ trust.store.password=airavata
 #class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file

Modified: airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties Fri Nov 15 14:41:51 2013
@@ -218,3 +218,7 @@ class.registry.accessor=org.apache.airav
 #class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
 registry.service.wsdl=http://localhost:${port}/axis2/services/RegistryService?wsdl
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
\ No newline at end of file

Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties Fri Nov 15 14:41:51 2013
@@ -227,3 +227,8 @@ default.registry.gateway=default
 #class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
\ No newline at end of file

Modified: airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties (original)
+++ airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties Fri Nov 15 14:41:51 2013
@@ -218,3 +218,7 @@ class.registry.accessor=org.apache.airav
 #class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
 registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060

Modified: airavata/trunk/samples/sample-gateway/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/resources/airavata-client.properties?rev=1542277&r1=1542276&r2=1542277&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/samples/sample-gateway/src/main/resources/airavata-client.properties Fri Nov 15 14:41:51 2013
@@ -67,3 +67,11 @@ trust.store.password=airavata
 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000
 
 #registry.service.wsdl=http://localhost:8080/airavata-server/services/RegistryService?wsdl
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
+
+#class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerImpl
+class.execution.service.impl=org.apache.airavata.client.impl.ExecutionManagerThriftImpl
\ No newline at end of file