You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/09/08 16:58:26 UTC
svn commit: r1166725 - in /incubator/airavata/trunk/modules:
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/
gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/
gfac-core/src/main/java/org/apache/airavat...
Author: patanachai
Date: Thu Sep 8 14:58:26 2011
New Revision: 1166725
URL: http://svn.apache.org/viewvc?rev=1166725&view=rev
Log:
Change input/output constants to methods
Modified:
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/InvocationContext.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultInvocationContext.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/message/MessageContext.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/EC2Provider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/GramProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/LocalProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/SSHProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Thu Sep 8 14:58:26 2011
@@ -190,8 +190,8 @@ public class GFacMessageReciever impleme
outputParam.add(parameter.getName(), SchemaUtil.mapFromType(parameter.getType()));
}
- ct.addMessageContext(ParameterContextImpl.INPUT_KEY, inputParam);
- ct.addMessageContext(ParameterContextImpl.OUTPUT_KEY, outputParam);
+ ct.setInput(inputParam);
+ ct.setOutput(outputParam);
if (service == null) {
service = new PropertyServiceFactory().createService();
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/InvocationContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/InvocationContext.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/InvocationContext.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/InvocationContext.java Thu Sep 8 14:58:26 2011
@@ -37,13 +37,42 @@ public interface InvocationContext {
* @return
*/
public String getServiceName();
+
+ /**
+ * Get input. Use to handle specific MessageContext for input
+ *
+ * @return MessageContext contains input
+ */
+ public <T> MessageContext<T> getInput();
+
+ /**
+ * Set MessageContext as input
+ *
+ * @param value
+ */
+ public <T extends MessageContext<?>> void setInput(T value);
/**
+ * Get output. Use to handle specific MessageContext for output
+ *
+ * @return MessageContext contains output
+ */
+ public <T> MessageContext<T> getOutput();
+
+ /**
+ * Set MessageContext as output
+ *
+ * @param value
+ */
+ public <T extends MessageContext<?>> void setOutput(T value);
+
+ /**
* Get ExecutionDescription
*
* @return ExecutionDescription
*/
public ExecutionDescription getExecutionDescription();
+
/**
* Set ExecutionDescription
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultInvocationContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultInvocationContext.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultInvocationContext.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultInvocationContext.java Thu Sep 8 14:58:26 2011
@@ -37,6 +37,9 @@ import org.apache.airavata.core.gfac.con
*/
public class DefaultInvocationContext implements InvocationContext{
+ protected final String MESSAGE_CONTEXT_INPUT = "input";
+ protected final String MESSAGE_CONTEXT_OUTPUT = "output";
+
private String serviceName;
private ExecutionContext executionContext;
private ExecutionDescription gfacContext;
@@ -82,5 +85,22 @@ public class DefaultInvocationContext im
public <T extends SecurityContext> void addSecurityContext(String name, T value) {
this.securityContextMap.put(name, value);
+ }
+
+ public <T> MessageContext<T> getInput() {
+ return getMessageContext(MESSAGE_CONTEXT_INPUT);
+ }
+
+ public <T extends MessageContext<?>> void setInput(T value) {
+ this.messageContextMap.put(MESSAGE_CONTEXT_INPUT, value);
+ }
+
+ public <T> MessageContext<T> getOutput() {
+ return getMessageContext(MESSAGE_CONTEXT_OUTPUT);
+ }
+
+ public <T extends MessageContext<?>> void setOutput(T value) {
+ this.messageContextMap.put(MESSAGE_CONTEXT_OUTPUT, value);
+
};
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/message/MessageContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/message/MessageContext.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/message/MessageContext.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/message/MessageContext.java Thu Sep 8 14:58:26 2011
@@ -33,18 +33,7 @@ import java.util.Iterator;
* @param <T>
* class that associate with this message
*/
-public interface MessageContext<T> {
-
-
- /**
- * Constant for input message key
- */
- public static final String INPUT_KEY = "input";
-
- /**
- * Constant for output message key
- */
- public static final String OUTPUT_KEY = "output";
+public interface MessageContext<T> {
/**
* Get list of names in the context
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/GridFtpOutputStaging.java Thu Sep 8 14:58:26 2011
@@ -48,7 +48,7 @@ public class GridFtpOutputStaging extend
public boolean execute(InvocationContext context) throws GfacException {
try {
- MessageContext<AbstractParameter> x = context.getMessageContext(MessageContext.OUTPUT_KEY);
+ MessageContext<AbstractParameter> x = context.getOutput();
for (Iterator<String> iterator = x.getNames(); iterator.hasNext();) {
String key = iterator.next();
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/GridFtpInputStaging.java Thu Sep 8 14:58:26 2011
@@ -49,7 +49,7 @@ public class GridFtpInputStaging extends
public boolean execute(InvocationContext context) throws GfacException {
try {
- MessageContext<AbstractParameter> x = context.getMessageContext(MessageContext.INPUT_KEY);
+ MessageContext<AbstractParameter> x = context.getInput();
for (Iterator<String> iterator = x.getNames(); iterator.hasNext();) {
String key = iterator.next();
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/pre/HttpInputStaging.java Thu Sep 8 14:58:26 2011
@@ -53,7 +53,7 @@ public class HttpInputStaging extends Pr
public boolean execute(InvocationContext context) throws GfacException {
try {
- MessageContext<AbstractParameter> x = context.getMessageContext(MessageContext.INPUT_KEY);
+ MessageContext<AbstractParameter> x = context.getInput();
for (Iterator<String> iterator = x.getNames(); iterator.hasNext();) {
String key = iterator.next();
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/EC2Provider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/EC2Provider.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/EC2Provider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/EC2Provider.java Thu Sep 8 14:58:26 2011
@@ -241,9 +241,9 @@ public class EC2Provider extends Abstrac
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext(MessageContext.INPUT_KEY).getNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getInput().getNames(); iterator.hasNext();) {
String key = iterator.next();
- tmp.add(context.getMessageContext(MessageContext.INPUT_KEY).getStringValue(key));
+ tmp.add(context.getInput().getStringValue(key));
}
List<String> cmdList = new ArrayList<String>();
@@ -347,7 +347,7 @@ public class EC2Provider extends Abstrac
String stdErrStr = GfacUtils.readFile(localStdErrFile.getAbsolutePath());
// set to context
- OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getMessageContext(MessageContext.OUTPUT_KEY), stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getOutput(), stdOutStr, stdErrStr);
} catch (Exception e) {
throw e;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/GramProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/GramProvider.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/GramProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/GramProvider.java Thu Sep 8 14:58:26 2011
@@ -201,7 +201,7 @@ public class GramProvider extends Abstra
String stderr = ftp.readRemoteFile(stderrURI, gssCred, localStdErrFile);
// set to context
- OutputUtils.fillOutputFromStdout(invocationContext.<AbstractParameter>getMessageContext(MessageContext.OUTPUT_KEY), stdout, stderr);
+ OutputUtils.fillOutputFromStdout(invocationContext.<AbstractParameter>getOutput(), stdout, stderr);
jobSucsseful = true;
} catch (GramException e) {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/LocalProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/LocalProvider.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/LocalProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/LocalProvider.java Thu Sep 8 14:58:26 2011
@@ -73,9 +73,9 @@ public class LocalProvider extends Abstr
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext(MessageContext.INPUT_KEY).getNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getInput().getNames(); iterator.hasNext();) {
String key = iterator.next();
- tmp.add(context.getMessageContext(MessageContext.INPUT_KEY).getStringValue(key));
+ tmp.add(context.getInput().getStringValue(key));
}
List<String> cmdList = new ArrayList<String>();
@@ -225,7 +225,7 @@ public class LocalProvider extends Abstr
String stdErrStr = GfacUtils.readFile(app.getStdErr());
// set to context
- OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getMessageContext(MessageContext.OUTPUT_KEY), stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getOutput(), stdOutStr, stdErrStr);
} catch (IOException e) {
log.error("error", e);
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/SSHProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/SSHProvider.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/SSHProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/SSHProvider.java Thu Sep 8 14:58:26 2011
@@ -139,9 +139,9 @@ public class SSHProvider extends Abstrac
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext(MessageContext.INPUT_KEY).getNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getInput().getNames(); iterator.hasNext();) {
String key = iterator.next();
- tmp.add(context.getMessageContext(MessageContext.INPUT_KEY).getStringValue(key));
+ tmp.add(context.getInput().getStringValue(key));
}
List<String> cmdList = new ArrayList<String>();
@@ -243,7 +243,7 @@ public class SSHProvider extends Abstrac
String stdErrStr = GfacUtils.readFile(localStdErrFile.getAbsolutePath());
// set to context
- OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getMessageContext(MessageContext.OUTPUT_KEY), stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getOutput(), stdOutStr, stdErrStr);
} catch (Exception e) {
throw e;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java?rev=1166725&r1=1166724&r2=1166725&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java Thu Sep 8 14:58:26 2011
@@ -80,9 +80,9 @@ public class GramRSLGenerator {
jobAttr.setStdin(app.getStdIn());
} else {
// input parameter
- for (Iterator<String> iterator = context.getMessageContext(MessageContext.INPUT_KEY).getNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getInput().getNames(); iterator.hasNext();) {
String key = iterator.next();
- jobAttr.addArgument(context.getMessageContext(MessageContext.INPUT_KEY).getStringValue(key));
+ jobAttr.addArgument(context.getInput().getStringValue(key));
}
}