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/07 22:16:13 UTC
svn commit: r1166377 [2/2] - in /incubator/airavata/trunk/modules:
commons/gfac-schema/src/main/java/org/apache/airavata/commons/
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/
commons/gfac-schema/src/main/java/org/apache/airavata/...
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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -25,20 +25,20 @@ import java.io.File;
import java.net.URI;
import java.util.Iterator;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.MessageContext;
-import org.apache.airavata.core.gfac.context.impl.GSISecurityContext;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.DataType;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.host.GlobusHost;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.commons.gfac.type.parameter.FileParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.message.MessageContext;
+import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.extension.PostExecuteChain;
import org.apache.airavata.core.gfac.external.GridFtp;
-import org.apache.airavata.core.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.core.gfac.type.DataType;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
-import org.apache.airavata.core.gfac.type.host.GlobusHost;
-import org.apache.airavata.core.gfac.type.parameter.AbstractParameter;
-import org.apache.airavata.core.gfac.type.parameter.FileParameter;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.ietf.jgss.GSSCredential;
@@ -50,17 +50,17 @@ public class GridFtpOutputStaging extend
try {
MessageContext<AbstractParameter> x = context.getMessageContext("output");
- for (Iterator<String> iterator = x.getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = x.getNames(); iterator.hasNext();) {
String key = iterator.next();
- if (x.getParameterValue(key).getType() == DataType.File) {
- FileParameter fileParameter = (FileParameter) x.getParameterValue(key);
+ if (x.getValue(key).getType() == DataType.File) {
+ FileParameter fileParameter = (FileParameter) x.getValue(key);
/*
* Determine scheme
*/
URI uri = URI.create(fileParameter.toStringVal());
if (uri.getScheme().equalsIgnoreCase(GridFtp.GSIFTP_SCHEME)) {
- HostDescription hostDescription = context.getGfacContext().getHost();
+ HostDescription hostDescription = context.getExecutionDescription().getHost();
/*
* src complete URI
@@ -68,7 +68,7 @@ public class GridFtpOutputStaging extend
File file = new File(uri.getPath());
String srcFilePath = file.getName();
- ApplicationDeploymentDescription app = context.getGfacContext().getApp();
+ ApplicationDeploymentDescription app = context.getExecutionDescription().getApp();
if (app instanceof ShellApplicationDeployment) {
srcFilePath = app.getOutputDir() + File.separator + srcFilePath;
}
@@ -92,7 +92,7 @@ public class GridFtpOutputStaging extend
GridFtp ftp = new GridFtp();
GSSCredential gssCred = ((GSISecurityContext) context.getSecurityContext(MYPROXY_SECURITY_CONTEXT))
.getGssCredentails();
- GlobusHost host = (GlobusHost) context.getGfacContext().getHost();
+ GlobusHost host = (GlobusHost) context.getExecutionDescription().getHost();
URI srcURI = GfacUtils.createGsiftpURI(host.getGridFTPEndPoint(), remoteSrcFile);
ftp.transfer(srcURI, dest, gssCred, true);
}
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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -25,20 +25,21 @@ import java.io.File;
import java.net.URI;
import java.util.Iterator;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.MessageContext;
-import org.apache.airavata.core.gfac.context.impl.GSISecurityContext;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.DataType;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.host.GlobusHost;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.commons.gfac.type.parameter.FileParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.message.MessageContext;
+import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.extension.PreExecuteChain;
import org.apache.airavata.core.gfac.external.GridFtp;
-import org.apache.airavata.core.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.core.gfac.type.DataType;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
-import org.apache.airavata.core.gfac.type.host.GlobusHost;
-import org.apache.airavata.core.gfac.type.parameter.AbstractParameter;
-import org.apache.airavata.core.gfac.type.parameter.FileParameter;
+import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.ietf.jgss.GSSCredential;
@@ -49,19 +50,19 @@ public class GridFtpInputStaging extends
public boolean execute(InvocationContext context) throws GfacException {
try {
- MessageContext<AbstractParameter> x = context.getMessageContext("input");
+ MessageContext<AbstractParameter> x = context.getMessageContext(GFacConstants.MESSAGE_CONTEXT_INPUT_NAME);
- for (Iterator<String> iterator = x.getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = x.getNames(); iterator.hasNext();) {
String key = iterator.next();
- if (x.getParameterValue(key).getType() == DataType.File) {
- FileParameter fileParameter = (FileParameter) x.getParameterValue(key);
+ if (x.getValue(key).getType() == DataType.File) {
+ FileParameter fileParameter = (FileParameter) x.getValue(key);
/*
* Determine scheme
*/
URI uri = URI.create(fileParameter.toStringVal());
if (uri.getScheme().equalsIgnoreCase(GridFtp.GSIFTP_SCHEME)) {
- HostDescription hostDescription = context.getGfacContext().getHost();
+ HostDescription hostDescription = context.getExecutionDescription().getHost();
/*
* Desctination complete URI
@@ -69,7 +70,7 @@ public class GridFtpInputStaging extends
File file = new File(uri.getPath());
String destFilePath = file.getName();
- ApplicationDeploymentDescription app = context.getGfacContext().getApp();
+ ApplicationDeploymentDescription app = context.getExecutionDescription().getApp();
if (app instanceof ShellApplicationDeployment) {
destFilePath = app.getInputDir() + File.separator + destFilePath;
}
@@ -98,7 +99,7 @@ public class GridFtpInputStaging extends
GridFtp ftp = new GridFtp();
GSSCredential gssCred = ((GSISecurityContext) context.getSecurityContext(MYPROXY_SECURITY_CONTEXT))
.getGssCredentails();
- GlobusHost host = (GlobusHost) context.getGfacContext().getHost();
+ GlobusHost host = (GlobusHost) context.getExecutionDescription().getHost();
URI inputURI = GfacUtils.createGsiftpURI(host.getGridFTPEndPoint(), remoteFile);
ftp.transfer(src, inputURI, gssCred, true);
}
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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -30,20 +30,21 @@ import java.io.OutputStream;
import java.net.URI;
import java.util.Iterator;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.MessageContext;
-import org.apache.airavata.core.gfac.context.impl.GSISecurityContext;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.DataType;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.host.GlobusHost;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.commons.gfac.type.parameter.FileParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.message.MessageContext;
+import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.extension.PreExecuteChain;
import org.apache.airavata.core.gfac.external.GridFtp;
-import org.apache.airavata.core.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.core.gfac.type.DataType;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
-import org.apache.airavata.core.gfac.type.host.GlobusHost;
-import org.apache.airavata.core.gfac.type.parameter.AbstractParameter;
-import org.apache.airavata.core.gfac.type.parameter.FileParameter;
+import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.ietf.jgss.GSSCredential;
@@ -53,19 +54,19 @@ public class HttpInputStaging extends Pr
public boolean execute(InvocationContext context) throws GfacException {
try {
- MessageContext<AbstractParameter> x = context.getMessageContext("input");
+ MessageContext<AbstractParameter> x = context.getMessageContext(GFacConstants.MESSAGE_CONTEXT_INPUT_NAME);
- for (Iterator<String> iterator = x.getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = x.getNames(); iterator.hasNext();) {
String key = iterator.next();
- if (x.getParameterValue(key).getType() == DataType.File) {
- FileParameter fileParameter = (FileParameter) x.getParameterValue(key);
+ if (x.getValue(key).getType() == DataType.File) {
+ FileParameter fileParameter = (FileParameter) x.getValue(key);
/*
* Determine scheme
*/
URI uri = URI.create(fileParameter.toStringVal());
if (uri.getScheme().equalsIgnoreCase("http")) {
- HostDescription hostDescription = context.getGfacContext().getHost();
+ HostDescription hostDescription = context.getExecutionDescription().getHost();
/*
* Desctination complete URI
@@ -73,7 +74,7 @@ public class HttpInputStaging extends Pr
File file = new File(uri.getPath());
String destFilePath = file.getName();
- ApplicationDeploymentDescription app = context.getGfacContext().getApp();
+ ApplicationDeploymentDescription app = context.getExecutionDescription().getApp();
if (app instanceof ShellApplicationDeployment) {
destFilePath = app.getInputDir() + File.separator + destFilePath;
}
@@ -103,7 +104,7 @@ public class HttpInputStaging extends Pr
GSSCredential gssCred = ((GSISecurityContext) context.getSecurityContext(MYPROXY_SECURITY_CONTEXT))
.getGssCredentails();
- GlobusHost host = (GlobusHost) context.getGfacContext().getHost();
+ GlobusHost host = (GlobusHost) context.getExecutionDescription().getHost();
URI destURI = GfacUtils.createGsiftpURI(host.getGridFTPEndPoint(), remoteLocation);
InputStream in = null;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java Wed Sep 7 20:16:10 2011
@@ -29,11 +29,8 @@ import java.io.InputStream;
import java.net.URI;
import org.apache.airavata.core.gfac.exception.GfacException;
-import org.apache.airavata.core.gfac.type.host.GlobusHost;
import org.apache.airavata.core.gfac.utils.ContactInfo;
-import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.globus.ftp.DataChannelAuthentication;
-import org.globus.ftp.DataSource;
import org.globus.ftp.DataSourceStream;
import org.globus.ftp.GridFTPClient;
import org.globus.ftp.HostPort;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/EchoLocalServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/EchoLocalServiceFactory.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/EchoLocalServiceFactory.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/factory/EchoLocalServiceFactory.java Wed Sep 7 20:16:10 2011
@@ -25,13 +25,13 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import org.apache.airavata.commons.gfac.type.DataType;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.Parameter;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
import org.apache.airavata.core.gfac.services.GenericService;
import org.apache.airavata.core.gfac.services.impl.POJOServiceImpl;
-import org.apache.airavata.core.gfac.type.DataType;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.Parameter;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
public class EchoLocalServiceFactory extends AbstractServiceFactory {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/NotificationService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/NotificationService.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/NotificationService.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/NotificationService.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.notification;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DummyNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DummyNotification.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DummyNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DummyNotification.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.notification.impl;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.notification.NotificationService;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java Wed Sep 7 20:16:10 2011
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.core.gfac.notification.impl;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.notification.NotificationService;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java Wed Sep 7 20:16:10 2011
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.core.gfac.notification.impl;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.notification.NotificationService;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java Wed Sep 7 20:16:10 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.core.gfac.no
import java.net.URI;
import java.util.Properties;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.notification.NotificationService;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -45,13 +45,14 @@ import net.schmizz.sshj.connection.chann
import net.schmizz.sshj.connection.channel.direct.Session.Command;
import net.schmizz.sshj.xfer.scp.SCPFileTransfer;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.AmazonSecurityContext;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.security.impl.AmazonSecurityContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.notification.NotificationService;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.apache.airavata.core.gfac.utils.OutputUtils;
@@ -101,8 +102,8 @@ public class EC2Provider extends Abstrac
}
public void initialize(InvocationContext context) throws GfacException {
- HostDescription host = context.getGfacContext().getHost();
- ShellApplicationDeployment app = (ShellApplicationDeployment)context.getGfacContext().getApp();
+ HostDescription host = context.getExecutionDescription().getHost();
+ ShellApplicationDeployment app = (ShellApplicationDeployment)context.getExecutionDescription().getApp();
AmazonSecurityContext amazonSecurityContext = ((AmazonSecurityContext) context
.getSecurityContext(AMAZON_SECURITY_CONTEXT));
@@ -234,14 +235,14 @@ public class EC2Provider extends Abstrac
}
public void execute(InvocationContext context) throws GfacException {
- HostDescription host = context.getGfacContext().getHost();
- ShellApplicationDeployment app = (ShellApplicationDeployment)context.getGfacContext().getApp();
+ HostDescription host = context.getExecutionDescription().getHost();
+ ShellApplicationDeployment app = (ShellApplicationDeployment)context.getExecutionDescription().getApp();
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext("input").getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getMessageContext(GFacConstants.MESSAGE_CONTEXT_INPUT_NAME).getNames(); iterator.hasNext();) {
String key = iterator.next();
- tmp.add(context.getMessageContext("input").getStringParameterValue(key));
+ tmp.add(context.getMessageContext(GFacConstants.MESSAGE_CONTEXT_INPUT_NAME).getStringValue(key));
}
List<String> cmdList = new ArrayList<String>();
@@ -345,7 +346,7 @@ public class EC2Provider extends Abstrac
String stdErrStr = GfacUtils.readFile(localStdErrFile.getAbsolutePath());
// set to context
- OutputUtils.fillOutputFromStdout(context.getMessageContext("output"), stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getMessageContext("output"), 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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -26,8 +26,13 @@ import java.net.URI;
import javax.xml.namespace.QName;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.GSISecurityContext;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.commons.gfac.type.app.GramApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.host.GlobusHost;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.exception.JobSubmissionFault;
@@ -35,10 +40,6 @@ import org.apache.airavata.core.gfac.ext
import org.apache.airavata.core.gfac.notification.NotificationService;
import org.apache.airavata.core.gfac.provider.utils.GramRSLGenerator;
import org.apache.airavata.core.gfac.provider.utils.JobSubmissionListener;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
-import org.apache.airavata.core.gfac.type.app.GramApplicationDeployment;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
-import org.apache.airavata.core.gfac.type.host.GlobusHost;
import org.apache.airavata.core.gfac.utils.ErrorCodes;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.apache.airavata.core.gfac.utils.OutputUtils;
@@ -53,8 +54,8 @@ public class GramProvider extends Abstra
public static final String MYPROXY_SECURITY_CONTEXT = "myproxy";
public void initialize(InvocationContext invocationContext) throws GfacException {
- GlobusHost host = (GlobusHost)invocationContext.getGfacContext().getHost();
- ShellApplicationDeployment app = (ShellApplicationDeployment)invocationContext.getGfacContext().getApp();
+ GlobusHost host = (GlobusHost)invocationContext.getExecutionDescription().getHost();
+ ShellApplicationDeployment app = (ShellApplicationDeployment)invocationContext.getExecutionDescription().getApp();
GridFtp ftp = new GridFtp();
@@ -89,9 +90,9 @@ public class GramProvider extends Abstra
}
public void execute(InvocationContext invocationContext) throws GfacException {
- GlobusHost host = (GlobusHost)invocationContext.getGfacContext().getHost();
- GramApplicationDeployment app = (GramApplicationDeployment)invocationContext.getGfacContext().getApp();
- ServiceDescription service = invocationContext.getGfacContext().getService();
+ GlobusHost host = (GlobusHost)invocationContext.getExecutionDescription().getHost();
+ GramApplicationDeployment app = (GramApplicationDeployment)invocationContext.getExecutionDescription().getApp();
+ ServiceDescription service = invocationContext.getExecutionDescription().getService();
log.info("Searching for Gate Keeper");
String gatekeeper = host.getGlobusGateKeeperEndPoint();
@@ -199,7 +200,7 @@ public class GramProvider extends Abstra
String stderr = ftp.readRemoteFile(stderrURI, gssCred, localStdErrFile);
// set to context
- OutputUtils.fillOutputFromStdout(invocationContext.getMessageContext("output"), stdout, stderr);
+ OutputUtils.fillOutputFromStdout(invocationContext.<AbstractParameter>getMessageContext("output"), 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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -32,14 +32,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.notification.NotificationService;
-import org.apache.airavata.core.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.apache.airavata.core.gfac.utils.OutputUtils;
@@ -58,7 +59,7 @@ public class LocalProvider extends Abstr
}
public void initialize(InvocationContext invocationContext) throws GfacException {
- ApplicationDeploymentDescription app = invocationContext.getGfacContext().getApp();
+ ApplicationDeploymentDescription app = invocationContext.getExecutionDescription().getApp();
log.info("working diectroy = " + app.getWorkingDir());
log.info("temp directory = " + app.getTmpDir());
@@ -69,15 +70,15 @@ public class LocalProvider extends Abstr
}
public void execute(InvocationContext context) throws GfacException {
- HostDescription host = context.getGfacContext().getHost();
- ShellApplicationDeployment app = (ShellApplicationDeployment)context.getGfacContext().getApp();
- ServiceDescription service = context.getGfacContext().getService();
+ HostDescription host = context.getExecutionDescription().getHost();
+ ShellApplicationDeployment app = (ShellApplicationDeployment)context.getExecutionDescription().getApp();
+ ServiceDescription service = context.getExecutionDescription().getService();
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext("input").getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getMessageContext("input").getNames(); iterator.hasNext();) {
String key = iterator.next();
- tmp.add(context.getMessageContext("input").getStringParameterValue(key));
+ tmp.add(context.getMessageContext("input").getStringValue(key));
}
List<String> cmdList = new ArrayList<String>();
@@ -227,7 +228,7 @@ public class LocalProvider extends Abstr
String stdErrStr = GfacUtils.readFile(app.getStdErr());
// set to context
- OutputUtils.fillOutputFromStdout(context.getMessageContext("output"), stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getMessageContext("output"), 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/Provider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.provider;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
public interface Provider {
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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -37,12 +37,13 @@ import net.schmizz.sshj.connection.chann
import net.schmizz.sshj.userauth.keyprovider.KeyProvider;
import net.schmizz.sshj.xfer.scp.SCPFileTransfer;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.SSHSecurityContextImpl;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.security.impl.SSHSecurityContextImpl;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.notification.NotificationService;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.apache.airavata.core.gfac.utils.OutputUtils;
@@ -79,8 +80,8 @@ public class SSHProvider extends Abstrac
}
public void initialize(InvocationContext context) throws GfacException {
- HostDescription host = context.getGfacContext().getHost();
- ShellApplicationDeployment app = (ShellApplicationDeployment) context.getGfacContext().getApp();
+ HostDescription host = context.getExecutionDescription().getHost();
+ ShellApplicationDeployment app = (ShellApplicationDeployment) context.getExecutionDescription().getApp();
SSHClient ssh = new SSHClient();
try {
@@ -123,14 +124,14 @@ public class SSHProvider extends Abstrac
}
public void execute(InvocationContext context) throws GfacException {
- HostDescription host = context.getGfacContext().getHost();
- ShellApplicationDeployment app = (ShellApplicationDeployment) context.getGfacContext().getApp();
+ HostDescription host = context.getExecutionDescription().getHost();
+ ShellApplicationDeployment app = (ShellApplicationDeployment) context.getExecutionDescription().getApp();
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext("input").getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getMessageContext("input").getNames(); iterator.hasNext();) {
String key = iterator.next();
- tmp.add(context.getMessageContext("input").getStringParameterValue(key));
+ tmp.add(context.getMessageContext("input").getStringValue(key));
}
List<String> cmdList = new ArrayList<String>();
@@ -226,7 +227,7 @@ public class SSHProvider extends Abstrac
String stdErrStr = GfacUtils.readFile(localStdErrFile.getAbsolutePath());
// set to context
- OutputUtils.fillOutputFromStdout(context.getMessageContext("output"), stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout(context.<AbstractParameter>getMessageContext("output"), 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=1166377&r1=1166376&r2=1166377&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 Wed Sep 7 20:16:10 2011
@@ -25,12 +25,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.commons.gfac.type.app.GramApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.host.GlobusHost;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
-import org.apache.airavata.core.gfac.type.app.GramApplicationDeployment;
-import org.apache.airavata.core.gfac.type.host.GlobusHost;
import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.globus.gram.GramAttributes;
import org.slf4j.Logger;
@@ -44,9 +44,9 @@ public class GramRSLGenerator {
};
public static GramAttributes configureRemoteJob(InvocationContext context) throws GfacException {
- GlobusHost host = (GlobusHost) context.getGfacContext().getHost();
- GramApplicationDeployment app = (GramApplicationDeployment) context.getGfacContext().getApp();
- ServiceDescription service = context.getGfacContext().getService();
+ GlobusHost host = (GlobusHost) context.getExecutionDescription().getHost();
+ GramApplicationDeployment app = (GramApplicationDeployment) context.getExecutionDescription().getApp();
+ ServiceDescription service = context.getExecutionDescription().getService();
GramAttributes jobAttr = new GramAttributes();
jobAttr.setExecutable(app.getExecutable());
@@ -85,9 +85,9 @@ public class GramRSLGenerator {
} else {
// input parameter
ArrayList<String> tmp = new ArrayList<String>();
- for (Iterator<String> iterator = context.getMessageContext("input").getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = context.getMessageContext(GFacConstants.MESSAGE_CONTEXT_INPUT_NAME).getNames(); iterator.hasNext();) {
String key = iterator.next();
- jobAttr.addArgument(context.getMessageContext("input").getStringParameterValue(key));
+ jobAttr.addArgument(context.getMessageContext(GFacConstants.MESSAGE_CONTEXT_INPUT_NAME).getStringValue(key));
}
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java Wed Sep 7 20:16:10 2011
@@ -21,12 +21,9 @@
package org.apache.airavata.core.gfac.provider.utils;
-import org.apache.airavata.core.gfac.context.ExecutionContext;
-import org.apache.airavata.core.gfac.context.GFACContext;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.GSISecurityContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.exception.GfacException;
-import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.globus.gram.GramException;
import org.globus.gram.GramJob;
import org.globus.gram.GramJobListener;
@@ -78,12 +75,12 @@ public class JobSubmissionListener imple
}
}
}
-
+
public synchronized void statusChanged(GramJob job) {
int jobStatus = job.getStatus();
String jobId = job.getIDAsString();
String statusString = job.getStatusAsString();
- String jobStatusMessage = GfacUtils.formatJobStatus(jobId, statusString);
+ String jobStatusMessage = formatJobStatus(jobId, statusString);
log.info(jobStatusMessage);
status = jobStatus;
context.getExecutionContext().getNotificationService().statusChanged(this, this.context, jobStatusMessage);
@@ -107,6 +104,10 @@ public class JobSubmissionListener imple
public int getStatus() {
return status;
}
+
+ private String formatJobStatus(String jobid, String jobstatus) {
+ return "Status of job " + jobid + "is " + jobstatus;
+ }
public void wakeup() {
try {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/Scheduler.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/Scheduler.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/Scheduler.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.scheduler;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.provider.Provider;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/POJOSchedulerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/POJOSchedulerImpl.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/POJOSchedulerImpl.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/POJOSchedulerImpl.java Wed Sep 7 20:16:10 2011
@@ -21,19 +21,19 @@
package org.apache.airavata.core.gfac.scheduler.impl;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.provider.GramProvider;
import org.apache.airavata.core.gfac.provider.LocalProvider;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
-import org.apache.airavata.core.gfac.type.HostDescription;
import org.apache.airavata.core.gfac.utils.GfacUtils;
public class POJOSchedulerImpl implements Scheduler {
public Provider schedule(InvocationContext context) throws GfacException {
- HostDescription host = context.getGfacContext().getHost();
+ HostDescription host = context.getExecutionDescription().getHost();
if(GfacUtils.isLocalHost(host.getName())){
return new LocalProvider();
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Wed Sep 7 20:16:10 2011
@@ -24,109 +24,96 @@ package org.apache.airavata.core.gfac.sc
import java.util.Iterator;
import java.util.List;
-import org.apache.airavata.core.gfac.api.Registry;
-import org.apache.airavata.core.gfac.context.GFACContext;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.commons.gfac.api.Registry;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionDescription;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.provider.GramProvider;
import org.apache.airavata.core.gfac.provider.LocalProvider;
import org.apache.airavata.core.gfac.provider.Provider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
-import org.apache.airavata.core.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SchedulerImpl implements Scheduler {
-
+
private static Logger log = LoggerFactory.getLogger(SchedulerImpl.class);
- public Provider schedule(InvocationContext context) throws GfacException {
+ public Provider schedule(InvocationContext context) throws GfacException {
- Registry registryService = context.getExecutionContext()
- .getRegistryService();
+ Registry registryService = context.getExecutionContext().getRegistryService();
- /*
- * Load Service
- */
- ServiceDescription serviceDesc = registryService
- .getServiceDescription(context.getServiceName());
-
- if (serviceDesc == null)
- throw new GfacException("Service Desciption for "
- + context.getServiceName()
- + " does not found on resource Catalog " + registryService,
- FaultCode.InvalidRequest);
-
- /*
- * Load host
- */
- HostDescription host = scheduleToHost(registryService,
- context.getServiceName());
-
- if (host == null)
- throw new GfacException("Host Desciption for "
- + context.getServiceName()
- + " does not found on resource Catalog " + registryService,
- FaultCode.InvalidRequest);
-
- /*
- * Load app
- */
- ApplicationDeploymentDescription app = registryService
- .getDeploymentDescription(context.getServiceName(),
- host.getName());
-
- if (app == null)
- throw new GfacException("App Desciption for "
- + context.getServiceName()
- + " does not found on resource Catalog " + registryService,
- FaultCode.InvalidRequest);
-
- /*
- * Binding
- */
-
- if (context.getGfacContext() == null) {
- context.setGfacContext(new GFACContext());
- }
- context.getGfacContext().setHost(host);
- context.getGfacContext().setService(serviceDesc);
- context.getGfacContext().setApp(app);
-
- /*
- * Determine provider
- */
- String hostName = host.getName();
- if (GfacUtils.isLocalHost(hostName)) {
- return new LocalProvider();
- } else {
- return new GramProvider();
- }
-
- }
-
- private HostDescription scheduleToHost(Registry regService,
- String serviceName) {
-
- log.info("Searching registry for some deployed application hosts");
- List<HostDescription> hosts = regService
- .getServiceLocation(serviceName);
- if (hosts != null && hosts.size() > 0) {
- HostDescription result = null;
- for (Iterator iterator = hosts.iterator(); iterator.hasNext();) {
- result = (HostDescription) iterator.next();
-
- log.info("Found service on: " + result.getName());
- }
- return result;
- } else {
- log.warn("Applcation " + serviceName
- + " not found in registry");
- return null;
- }
- }
+ /*
+ * Load Service
+ */
+ ServiceDescription serviceDesc = registryService.getServiceDescription(context.getServiceName());
+
+ if (serviceDesc == null)
+ throw new GfacException("Service Desciption for " + context.getServiceName()
+ + " does not found on resource Catalog " + registryService, FaultCode.InvalidRequest);
+
+ /*
+ * Load host
+ */
+ HostDescription host = scheduleToHost(registryService, context.getServiceName());
+
+ if (host == null)
+ throw new GfacException("Host Desciption for " + context.getServiceName()
+ + " does not found on resource Catalog " + registryService, FaultCode.InvalidRequest);
+
+ /*
+ * Load app
+ */
+ ApplicationDeploymentDescription app = registryService.getDeploymentDescription(context.getServiceName(),
+ host.getName());
+
+ if (app == null)
+ throw new GfacException("App Desciption for " + context.getServiceName()
+ + " does not found on resource Catalog " + registryService, FaultCode.InvalidRequest);
+
+ /*
+ * Check class and binding
+ */
+
+ if (context.getExecutionDescription() == null) {
+ context.setExecutionDescription(new DefaultExecutionDescription());
+ }
+ context.getExecutionDescription().setHost(host);
+ context.getExecutionDescription().setService(serviceDesc);
+ context.getExecutionDescription().setApp(app);
+
+ /*
+ * Determine provider
+ */
+ String hostName = host.getName();
+ if (GfacUtils.isLocalHost(hostName)) {
+ return new LocalProvider();
+ } else {
+ return new GramProvider();
+ }
+
+ }
+
+ private HostDescription scheduleToHost(Registry regService, String serviceName) {
+
+ log.info("Searching registry for some deployed application hosts");
+ List<HostDescription> hosts = regService.getServiceLocation(serviceName);
+ if (hosts != null && hosts.size() > 0) {
+ HostDescription result = null;
+ for (Iterator iterator = hosts.iterator(); iterator.hasNext();) {
+ result = (HostDescription) iterator.next();
+
+ log.info("Found service on: " + result.getName());
+ }
+ return result;
+ } else {
+ log.warn("Applcation " + serviceName + " not found in registry");
+ return null;
+ }
+ }
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/GenericService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/GenericService.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/GenericService.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/GenericService.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.services;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
public interface GenericService {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.services.impl;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.extension.DataServiceChain;
import org.apache.airavata.core.gfac.extension.ExitableChain;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/POJOServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/POJOServiceImpl.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/POJOServiceImpl.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/POJOServiceImpl.java Wed Sep 7 20:16:10 2011
@@ -21,24 +21,25 @@
package org.apache.airavata.core.gfac.services.impl;
-import org.apache.airavata.core.gfac.context.GFACContext;
-import org.apache.airavata.core.gfac.context.InvocationContext;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.core.gfac.context.invocation.ExecutionDescription;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionDescription;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.extension.DataServiceChain;
import org.apache.airavata.core.gfac.extension.PostExecuteChain;
import org.apache.airavata.core.gfac.extension.PreExecuteChain;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
import org.apache.airavata.core.gfac.scheduler.impl.POJOSchedulerImpl;
-import org.apache.airavata.core.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
public class POJOServiceImpl extends AbstractSimpleService {
- private GFACContext context;
+ private ExecutionDescription context;
public POJOServiceImpl(HostDescription host, ApplicationDeploymentDescription app, ServiceDescription service){
- this.context = new GFACContext();
+ this.context = new DefaultExecutionDescription();
context.setHost(host);
context.setApp(app);
context.setService(service);
@@ -51,7 +52,7 @@ public class POJOServiceImpl extends Abs
}
public void preProcess(InvocationContext context) throws GfacException {
- context.setGfacContext(this.context);
+ context.setExecutionDescription(this.context);
}
public void postProcess(InvocationContext context) throws GfacException {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Wed Sep 7 20:16:10 2011
@@ -28,11 +28,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.airavata.core.gfac.api.Registry;
-import org.apache.airavata.core.gfac.api.impl.JCRRegistry;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.GSISecurityContext;
-import org.apache.airavata.core.gfac.context.impl.SSHSecurityContextImpl;
+import org.apache.airavata.commons.gfac.api.Registry;
+import org.apache.airavata.commons.gfac.api.impl.JCRRegistry;
+import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
+import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
+import org.apache.airavata.core.gfac.context.security.impl.SSHSecurityContextImpl;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.GfacException.FaultCode;
import org.apache.airavata.core.gfac.extension.DataServiceChain;
@@ -243,7 +244,7 @@ public class PropertiesBasedServiceImpl
/*
* If there is no specific registry service, use the default one.
*/
- context.getExecutionContext().setRegistryService(this.registryService);
+ ((DefaultExecutionContext)context.getExecutionContext()).setRegistryService(this.registryService);
}
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GFacConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GFacConstants.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GFacConstants.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GFacConstants.java Wed Sep 7 20:16:10 2011
@@ -22,6 +22,9 @@
package org.apache.airavata.core.gfac.utils;
public class GFacConstants {
+
+ public static final String MESSAGE_CONTEXT_INPUT_NAME = "input";
+ public static final String MESSAGE_CONTEXT_OUTPUT_NAME = "output";
public static final String INPUT_DATA_DIR_VAR_NAME = "inputData";
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/GfacUtils.java Wed Sep 7 20:16:10 2011
@@ -21,26 +21,17 @@
package org.apache.airavata.core.gfac.utils;
-import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringWriter;
import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.Date;
import java.util.Properties;
-import java.util.Random;
import java.util.UUID;
-import java.util.Vector;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.xml.namespace.QName;
@@ -50,43 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class GfacUtils {
- protected final static Logger log = LoggerFactory.getLogger(GfacUtils.class);
- private static AtomicInteger tempFileCount = new AtomicInteger();
- private static Random random = new Random();
-
- public static void writeToFile(InputStream is, File file) throws IOException {
- FileWriter fw = new FileWriter(file);
-
- // get the standard out of the application and write to file
-
- Reader reader = new InputStreamReader(is);
- char[] cbuf = new char[1024];
- while ((reader.read(cbuf, 0, 1024)) != -1) {
- fw.write(cbuf);
- }
- fw.close();
- reader.close();
- is.close();
- }
-
- public static void writeToFile(String data, File file) throws IOException {
- FileWriter fw = null;
- try {
- fw = new FileWriter(file);
- // get the standard out of the application and write to file
- fw.write(data);
- } catch (IOException io) {
- throw io;
- } finally {
- if (fw != null) {
- try {
- fw.close();
- } catch (IOException e) {
- throw e;
- }
- }
- }
- }
+ protected final static Logger log = LoggerFactory.getLogger(GfacUtils.class);
public static String readFromStream(InputStream in) throws IOException {
StringBuffer wsdlStr = new StringBuffer();
@@ -145,12 +100,6 @@ public class GfacUtils {
return serviceName.getLocalPart() + "_" + date + "_" + UUID.randomUUID();
}
- public static String createErrorMessage(Exception e) {
- StringWriter errStrW = new StringWriter();
- e.printStackTrace(new PrintWriter(errStrW));
- return errStrW.getBuffer().toString();
- }
-
public static URI createGsiftpURI(ContactInfo host, String localPath) throws GfacException {
try {
StringBuffer buf = new StringBuffer();
@@ -181,29 +130,6 @@ public class GfacUtils {
throw new GfacException(e, FaultCode.InvaliedLocalArgumnet);
}
}
-
- public static Vector<URI> listLocalDir(String dirName, String localhost) throws GfacException {
- try {
- Vector<URI> files = new Vector<URI>();
- File dir = new File(dirName);
-
- if (dir.exists()) {
- File[] fileList = dir.listFiles();
- for (File file : fileList) {
- if (!file.getName().equals(".") && !file.getName().equals("..")) {
- URI uri = new URI("gsiftp://" + localhost + "/" + file.getAbsolutePath());
- files.add(uri);
- }
- }
- } else {
- throw new GfacException("can not find the output data directory to list files",
- FaultCode.InvaliedLocalArgumnet);
- }
- return files;
- } catch (URISyntaxException e) {
- throw new GfacException(e, FaultCode.InvaliedLocalArgumnet);
- }
- }
public static URI createWorkflowQName(QName name) throws GfacException {
try {
@@ -220,33 +146,4 @@ public class GfacUtils {
}
return value.trim();
}
-
- public static boolean findBooleanProperty(Properties config, String name, boolean defaultVal) {
- String value = config.getProperty(name);
- if (value == null) {
- return defaultVal;
- }
- return Boolean.valueOf(value.trim());
- }
-
- public static String formatJobStatus(String jobid, String jobstatus) {
- return "Status of job " + jobid + "is " + jobstatus;
- }
-
- public static String createRandomName(String name) {
- return name + System.currentTimeMillis() + "_" + tempFileCount.incrementAndGet();
- }
-
- public static Random getRandom() {
- return random;
- }
-
- public static boolean isArray(String typeName) {
- if (typeName.endsWith("Array")) {
- // TODO make it more tigter
- return true;
- } else {
- return false;
- }
- }
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/OutputUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/OutputUtils.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/OutputUtils.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/OutputUtils.java Wed Sep 7 20:16:10 2011
@@ -25,22 +25,22 @@ import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.airavata.core.gfac.context.MessageContext;
-import org.apache.airavata.core.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.core.gfac.context.message.MessageContext;
public class OutputUtils {
public static void fillOutputFromStdout(MessageContext<AbstractParameter> outMessage, String stdout, String stderr) {
- for (Iterator<String> iterator = outMessage.getParameterNames(); iterator.hasNext();) {
+ for (Iterator<String> iterator = outMessage.getNames(); iterator.hasNext();) {
String parameterName = iterator.next();
// if parameter value is not already set, we let it go
- if (outMessage.getParameterValue(parameterName) == null) {
+ if (outMessage.getValue(parameterName) == null) {
continue;
}
- AbstractParameter x = outMessage.getParameterValue(parameterName);
+ AbstractParameter x = outMessage.getValue(parameterName);
x.parseStringVal(parseStdout(stdout, parameterName));
}
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
jcr.class=org.apache.jackrabbit.core.RepositoryFactoryImpl
#jcr.class=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-org.apache.jackrabbit.repository.uri=http://localhost:8080/rmi
+#org.apache.jackrabbit.repository.uri=http://localhost:8080/rmi
jcr.user=admin
jcr.pass=admin
@@ -29,3 +29,14 @@ scheduler.class= org.apache.airavata.cor
datachain.classes=org.apache.airavata.core.gfac.extension.data.RegistryDataService
prechain.classes=org.apache.airavata.core.gfac.extension.pre.GridFtpInputStaging, org.apache.airavata.core.gfac.extension.pre.HttpInputStaging
postchain.classes=org.apache.airavata.core.gfac.extension.post.GridFtpOutputStaging
+
+#SSH key
+#ssh.key=/home/user/.ssh/id_rsa
+#ssh.keypass=
+#ssh.username=usernameAtHost
+
+#My proxy
+#myproxy.server=myproxy.teragrid.org
+#myproxy.user=username
+#myproxy.pass=password
+#myproxy.life=3600
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/factory/EchoLocalFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/factory/EchoLocalFactoryTest.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/factory/EchoLocalFactoryTest.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/factory/EchoLocalFactoryTest.java Wed Sep 7 20:16:10 2011
@@ -21,13 +21,14 @@
package org.apache.airavata.core.gfac.factory;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.ExecutionContextImpl;
-import org.apache.airavata.core.gfac.context.impl.ParameterContextImpl;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.commons.gfac.type.parameter.StringParameter;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultInvocationContext;
+import org.apache.airavata.core.gfac.context.message.impl.ParameterContextImpl;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.notification.impl.StandardOutNotification;
import org.apache.airavata.core.gfac.services.GenericService;
-import org.apache.airavata.core.gfac.type.parameter.StringParameter;
import org.junit.Assert;
import org.junit.Test;
@@ -35,7 +36,7 @@ public class EchoLocalFactoryTest {
@Test
public void testEchoLocal() {
- InvocationContext ct = new InvocationContext();
+ DefaultInvocationContext ct = new DefaultInvocationContext();
/*
* Input
@@ -43,20 +44,21 @@ public class EchoLocalFactoryTest {
ParameterContextImpl input = new ParameterContextImpl();
StringParameter z = new StringParameter();
z.parseStringVal("echo_output=hello");
- input.addParameter("echo_input", z);
+ input.add("echo_input", z);
/*
* Output
*/
ParameterContextImpl output = new ParameterContextImpl();
StringParameter b = new StringParameter();
- output.addParameter("echo_output", b);
+ output.add("echo_output", b);
ct.addMessageContext("input", input);
ct.addMessageContext("output", output);
- ct.setExecutionContext(new ExecutionContextImpl());
- ct.getExecutionContext().setNotificationService(new StandardOutNotification());
+ DefaultExecutionContext x = new DefaultExecutionContext();
+ x.setNotificationService(new StandardOutNotification());
+ ct.setExecutionContext(x);
try {
@@ -69,10 +71,9 @@ public class EchoLocalFactoryTest {
}
Assert.assertNotNull(ct.getMessageContext("output"));
- Assert.assertNotNull(ct.getMessageContext("output").getParameterValue(
+ Assert.assertNotNull(ct.getMessageContext("output").getValue(
"echo_output"));
- Assert.assertEquals("hello", ((ParameterContextImpl) ct
- .getMessageContext("output")).getParameterValue("echo_output")
+ Assert.assertEquals("hello", (ct.<AbstractParameter>getMessageContext("output")).getValue("echo_output")
.toStringVal());
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java Wed Sep 7 20:16:10 2011
@@ -27,18 +27,18 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.airavata.core.gfac.api.impl.JCRRegistry;
-import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.impl.ExecutionContextImpl;
-import org.apache.airavata.core.gfac.context.impl.ParameterContextImpl;
+import org.apache.airavata.commons.gfac.api.impl.JCRRegistry;
+import org.apache.airavata.commons.gfac.type.DataType;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.Parameter;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
+import org.apache.airavata.commons.gfac.type.parameter.StringParameter;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
+import org.apache.airavata.core.gfac.context.invocation.impl.DefaultInvocationContext;
+import org.apache.airavata.core.gfac.context.message.impl.ParameterContextImpl;
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
-import org.apache.airavata.core.gfac.type.DataType;
-import org.apache.airavata.core.gfac.type.HostDescription;
-import org.apache.airavata.core.gfac.type.Parameter;
-import org.apache.airavata.core.gfac.type.ServiceDescription;
-import org.apache.airavata.core.gfac.type.app.ShellApplicationDeployment;
-import org.apache.airavata.core.gfac.type.parameter.AbstractParameter;
-import org.apache.airavata.core.gfac.type.parameter.StringParameter;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -108,11 +108,10 @@ public class PropertiesBasedServiceImplT
public void testExecute() {
try {
- InvocationContext ct = new InvocationContext();
- ct.setExecutionContext(new ExecutionContextImpl());
-
- ct.getExecutionContext().setNotificationService(
- new LoggingNotification());
+ DefaultInvocationContext ct = new DefaultInvocationContext();
+ DefaultExecutionContext ec = new DefaultExecutionContext();
+ ec.setNotificationService(new LoggingNotification());
+ ct.setExecutionContext(ec);
ct.setServiceName("SimpleEcho");
@@ -122,14 +121,14 @@ public class PropertiesBasedServiceImplT
ParameterContextImpl input = new ParameterContextImpl();
StringParameter echo_input = new StringParameter();
echo_input.parseStringVal("echo_output=hello");
- input.addParameter("echo_input", echo_input);
+ input.add("echo_input", echo_input);
/*
* Output
*/
ParameterContextImpl output = new ParameterContextImpl();
StringParameter echo_output = new StringParameter();
- output.addParameter("echo_output", echo_output);
+ output.add("echo_output", echo_output);
// parameter
ct.addMessageContext("input", input);
@@ -141,10 +140,10 @@ public class PropertiesBasedServiceImplT
Assert.assertNotNull(ct.getMessageContext("output"));
Assert.assertNotNull(ct.getMessageContext("output")
- .getParameterValue("echo_output"));
+ .getValue("echo_output"));
Assert.assertEquals("hello",
((AbstractParameter) ct.getMessageContext("output")
- .getParameterValue("echo_output")).toStringVal());
+ .getValue("echo_output")).toStringVal());
} catch (Exception e) {
e.printStackTrace();
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/type/StringParameterTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/type/StringParameterTest.java?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/type/StringParameterTest.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/type/StringParameterTest.java Wed Sep 7 20:16:10 2011
@@ -21,7 +21,7 @@
package org.apache.airavata.core.gfac.type;
-import org.apache.airavata.core.gfac.type.parameter.StringParameter;
+import org.apache.airavata.commons.gfac.type.parameter.StringParameter;
import org.junit.Test;
public class StringParameterTest {
Modified: incubator/airavata/trunk/modules/gfac-core/src/test/resources/service.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/resources/service.properties?rev=1166377&r1=1166376&r2=1166377&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/test/resources/service.properties (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/test/resources/service.properties Wed Sep 7 20:16:10 2011
@@ -21,11 +21,25 @@
jcr.class=org.apache.jackrabbit.core.RepositoryFactoryImpl
#jcr.class=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-#org.apache.jackrabbit.repository.uri=http://localhost:8080/rmi
+#org.apache.jackrabbit.repository.uri=http://localhost:8081/rmi
jcr.user=admin
jcr.pass=admin
scheduler.class= org.apache.airavata.core.gfac.scheduler.impl.SchedulerImpl
+
datachain.classes=org.apache.airavata.core.gfac.extension.data.RegistryDataService
+
prechain.classes=org.apache.airavata.core.gfac.extension.pre.GridFtpInputStaging, org.apache.airavata.core.gfac.extension.pre.HttpInputStaging
+
postchain.classes=org.apache.airavata.core.gfac.extension.post.GridFtpOutputStaging
+
+#SSH key
+#ssh.key=/home/user/.ssh/id_rsa
+#ssh.keypass=
+#ssh.username=usernameAtHost
+
+#My proxy
+#myproxy.server=myproxy.teragrid.org
+#myproxy.user=username
+#myproxy.pass=password
+#myproxy.life=3600
\ No newline at end of file