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/12/12 05:25:48 UTC
svn commit: r1550345 - 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: Thu Dec 12 04:25:48 2013
New Revision: 1550345
URL: http://svn.apache.org/r1550345
Log:
removing thrift integration from airavata api
Removed:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/thrift/
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/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/airavata-server/src/main/resources/conf/airavata-server.properties
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-client.properties
airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-server.properties
airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-client.properties
airavata/trunk/modules/gfac/gfac-ec2/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/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/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java
airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties
airavata/trunk/samples/airavata-client/create-application/src/main/resources/airavata-client.properties
airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/airavata-client.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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -74,7 +74,6 @@ 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;
@@ -349,27 +348,6 @@ public class AiravataClient extends Obse
}
public ExecutionManager getExecutionManager() {
- 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);
}
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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -83,38 +83,36 @@ public class ExecutionManagerThriftImpl
private String runExperimentGeneral(String wfname, List<WorkflowInput> inputs, ExperimentAdvanceOptions options, EventDataListener listener) throws AiravataAPIInvocationException {
Workflow workflowObj = null;
try {
- workflowObj = extractWorkflow(wfname);
- String experimentID = options.getCustomExperimentId();
- String workflowTemplateName = workflowObj.getName();
- if (experimentID == null || experimentID.isEmpty()) {
- experimentID = workflowTemplateName + "_" + UUID.randomUUID();
- }
- options.setCustomExperimentId(experimentID);
- getClient().getProvenanceManager().setWorkflowInstanceTemplateName(experimentID, workflowTemplateName);
-
- String submissionUser = getClient().getUserManager().getAiravataUser();
- String executionUser=options.getExperimentExecutionUser();
- if (executionUser==null){
- executionUser=submissionUser;
- }
- options.setExperimentExecutionUser(executionUser);
- runPreWorkflowExecutionTasks(experimentID, executionUser, options.getExperimentMetadata(), options.getExperimentName());
-
- String workflowContent = extractWorkflowContent(wfname);
+// workflowObj = extractWorkflow(wfname);
+// String experimentID = options.getCustomExperimentId();
+// String workflowTemplateName = workflowObj.getName();
+// if (experimentID == null || experimentID.isEmpty()) {
+// experimentID = workflowTemplateName + "_" + UUID.randomUUID();
+// }
+// options.setCustomExperimentId(experimentID);
+// getClient().getProvenanceManager().setWorkflowInstanceTemplateName(experimentID, workflowTemplateName);
+//
+// String submissionUser = getClient().getUserManager().getAiravataUser();
+// String executionUser=options.getExperimentExecutionUser();
+// if (executionUser==null){
+// executionUser=submissionUser;
+// }
+// options.setExperimentExecutionUser(executionUser);
+// runPreWorkflowExecutionTasks(experimentID, executionUser, options.getExperimentMetadata(), options.getExperimentName());
+//
+// String workflowContent = extractWorkflowContent(wfname);
Map<String, String> workflowInputs = new HashMap<String, String>();
for (WorkflowInput workflowInput : inputs){
String name = workflowInput.getName();
String value = (String)workflowInput.getValue();
workflowInputs.put(name, value);
}
- if (listener!=null){
- getExperimentMonitor(experimentID, listener).startMonitoring();
- }
+// if (listener!=null){
+// getExperimentMonitor(experimentID, listener).startMonitoring();
+// }
org.apache.airavata.experiment.execution.ExperimentAdvanceOptions experimentAdvanceOptions = generateAdvancedOptions(options);
- return getExecutionClient().runExperiment(workflowContent, workflowInputs, experimentAdvanceOptions);
- } catch (AiravataAPIInvocationException e) {
- throw new AiravataAPIInvocationException("Error occured while running the workflow", e);
- } catch (TException e) {
+ return getExecutionClient().runExperiment(wfname, workflowInputs, experimentAdvanceOptions);
+ } catch (TException e) {
throw new AiravataAPIInvocationException("Error occured while running the workflow", e);
}
}
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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -71,13 +71,6 @@ 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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -61,10 +61,3 @@ 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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -221,8 +221,3 @@ 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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -68,10 +68,3 @@ trust.store.password=airavata
#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
Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties (original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties Thu Dec 12 04:25:48 2013
@@ -251,8 +251,3 @@ registry.service.wsdl=http://localhost:$
# If false, disables two phase commit when submitting jobs
TwoPhase=true
-
-###################################################################################
-# Thrift configuration
-###################################################################################
-thrift.server.port=6060
\ 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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -64,10 +64,3 @@ 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
Modified: airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-client.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-client.properties Thu Dec 12 04:25:48 2013
@@ -64,10 +64,3 @@ 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/gfac-core/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-server.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/gfac/gfac-core/src/test/resources/airavata-server.properties Thu Dec 12 04:25:48 2013
@@ -229,7 +229,3 @@ 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/gfac/gfac-ec2/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-client.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-client.properties Thu Dec 12 04:25:48 2013
@@ -64,10 +64,4 @@ 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/gfac-ec2/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties Thu Dec 12 04:25:48 2013
@@ -229,7 +229,3 @@ 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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -64,10 +64,3 @@ 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/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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -63,10 +63,4 @@ 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-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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -62,10 +62,4 @@ 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/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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -218,7 +218,3 @@ 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/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java (original)
+++ airavata/trunk/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java Thu Dec 12 04:25:48 2013
@@ -31,19 +31,16 @@ import org.apache.thrift.transport.TTran
import org.apache.airavata.common.utils.ClientSettings;
public class ExecutionClient {
- public static final String THRIFT_SERVER_PORT = "thrift.server.port";
+ public static final int THRIFT_SERVER_PORT = 9090 ;
public InterpreterService.Client getInterpreterServiceClient (){
try {
- String thriftPort = ClientSettings.getSetting(THRIFT_SERVER_PORT);
- TTransport transport = new TSocket("localhost", Integer.parseInt(thriftPort));
+ TTransport transport = new TSocket("localhost", THRIFT_SERVER_PORT);
transport.open();
TProtocol protocol = new TBinaryProtocol(transport);
return new InterpreterService.Client(protocol);
} catch (TTransportException e) {
e.printStackTrace();
- } catch (ApplicationSettingsException e) {
- e.printStackTrace();
}
return null;
}
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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -228,7 +228,3 @@ default.registry.gateway=default
#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/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Thu Dec 12 04:25:48 2013
@@ -21,21 +21,6 @@
package org.apache.airavata.xbaya.interpretor;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
@@ -64,7 +49,6 @@ import org.apache.airavata.ws.monitor.Mo
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.concurrent.PredicatedTaskRunner;
-import org.apache.airavata.xbaya.interpretor.thrift.InterpreterServiceHandler;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
@@ -81,6 +65,16 @@ import org.apache.thrift.transport.TTran
import org.apache.xmlbeans.XmlException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
//import org.apache.airavata.registry.api.AiravataRegistry2;
/**
@@ -98,7 +92,6 @@ public class WorkflowInterpretorSkeleton
public static final String MYPROXY_SERVER = "myproxy.server";
public static final String MYPROXY_LIFETIME = "myproxy.life";
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
- public static final String THRIFT_SERVER_PORT = "thrift.server.port";
public static boolean provenance = false;
public static final String PROVENANCE = "provenance";
@@ -106,7 +99,7 @@ public class WorkflowInterpretorSkeleton
public static String systemUserPW = "";
public static boolean runInThread = false;
public static final String RUN_IN_THREAD = "runInThread";
- public static Boolean gfacEmbeddedMode = false;
+ public static Boolean gfacEmbeddedMode = true;
private static PredicatedTaskRunner runner = null;
// public static JCRComponentRegistry jcrComponentRegistry = null;
private static AiravataAPI airavataAPI=null;
@@ -212,22 +205,11 @@ public class WorkflowInterpretorSkeleton
*/
thread = new WIServiceThread(getAiravataAPI(), configctx);
thread.start();
-
- InterpreterService.Processor<InterpreterServiceHandler> processor = new InterpreterService.Processor<InterpreterServiceHandler>(new InterpreterServiceHandler());
- String thriftPort = ServerSettings.getSetting(THRIFT_SERVER_PORT);
- TServerTransport serverTransport = new TServerSocket(Integer.parseInt(thriftPort));
- TServer server = new TSimpleServer(
- new TServer.Args(serverTransport).processor(processor));
-
- log.info("Starting the simple thrift server...");
- server.serve();
- } catch (IOException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- } catch (URISyntaxException e) {
- e.printStackTrace();
- } catch (ApplicationSettingsException e) {
+ } catch (IOException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- } catch (TTransportException e) {
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ } catch (ApplicationSettingsException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
WorkflowInterpretorSkeleton.configurationContext = configctx;
@@ -274,7 +256,6 @@ public class WorkflowInterpretorSkeleton
}
/**
- *
* @param workflowAsString
* @param topic
* @param inputs
@@ -355,6 +336,7 @@ public class WorkflowInterpretorSkeleton
workflowContextHeaderBuilder.setSubmissionUser(submissionUser);
return workflowContextHeaderBuilder;
}
+
public String setupAndLaunch(String workflowAsString, String experimentId, String gatewayId, String username,
Map<String,String> inputs,boolean inNewThread,WorkflowContextHeaderBuilder builder) throws AiravataAPIInvocationException{
List<NameValue> inputData=new ArrayList<NameValue>();
@@ -370,6 +352,7 @@ public class WorkflowInterpretorSkeleton
return setupAndLaunch(workflowAsString, experimentId, gatewayId, username, inputData.toArray(new NameValue[]{}), configuration, inNewThread, builder);
}
+
private String setupAndLaunch(String workflowAsString, String topic, String gatewayId, String username,
NameValue[] inputs,Map<String,String>configurations,boolean inNewThread,
WorkflowContextHeaderBuilder builder) throws AiravataAPIInvocationException{
@@ -411,7 +394,7 @@ public class WorkflowInterpretorSkeleton
WorkflowInterpretorEventListener listener = null;
WorkflowInterpreter interpreter = null;
AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(gatewayId, username);
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,topic,conf.getMessageBoxURL(), conf.getBrokerURL(), airavataAPI, conf, null, null);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, topic, conf.getMessageBoxURL(), conf.getBrokerURL(), airavataAPI, conf, null, null);
workflowInterpreterConfiguration.setGfacEmbeddedMode(gfacEmbeddedMode);
workflowInterpreterConfiguration.setActOnProvenance(provenance);
@@ -423,7 +406,7 @@ public class WorkflowInterpretorSkeleton
interpreter = new WorkflowInterpreter(workflowInterpreterConfiguration, getInteractor());
listener = new WorkflowInterpretorEventListener(workflow, conf);
try {
- log.debug("start listener set");
+ log.debug("start listener set");
listener.start();
} catch (MonitorException e1) {
e1.printStackTrace();
@@ -573,6 +556,7 @@ public class WorkflowInterpretorSkeleton
}
return hostDescriptions;
}
+
public static final int URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
class WIServiceThread extends PeriodicExecutorThread {
Modified: airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties Thu Dec 12 04:25:48 2013
@@ -78,7 +78,3 @@ ssh.password=the science gateways group
#private.ssh.key=/path to private key file for ssh
#ssh.keypass=passphrase for the private key
-###################################################################################
-# Thrift configuration
-###################################################################################
-thrift.server.port=6060
Modified: airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties Thu Dec 12 04:25:48 2013
@@ -244,4 +244,4 @@ jcr.url=http://156.56.179.104:8081/jackr
jcr.username=admin
jcr.password=admin
with.Listener=false
-Input=Hi1,Hi2,Hi3
\ No newline at end of file
+Input=Hi1,Hi2,Hi3
Modified: airavata/trunk/samples/airavata-client/create-application/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/create-application/src/main/resources/airavata-client.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/create-application/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/samples/airavata-client/create-application/src/main/resources/airavata-client.properties Thu Dec 12 04:25:48 2013
@@ -58,3 +58,4 @@ 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
+
Modified: airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/airavata-client.properties?rev=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/airavata-client.properties Thu Dec 12 04:25:48 2013
@@ -58,3 +58,4 @@ 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
+
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=1550345&r1=1550344&r2=1550345&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties (original)
+++ airavata/trunk/samples/sample-gateway/src/configurations/airavata-server.properties Thu Dec 12 04:25:48 2013
@@ -218,7 +218,3 @@ 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=1550345&r1=1550344&r2=1550345&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 Thu Dec 12 04:25:48 2013
@@ -68,10 +68,3 @@ trust.store.password=airavata
#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