You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/31 04:44:19 UTC
svn commit: r1367399 - in
/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac:
provider/impl/GramProvider.java provider/impl/LocalProvider.java
provider/impl/SSHProvider.java utils/OutputUtils.java
Author: samindaw
Date: Tue Jul 31 02:44:18 2012
New Revision: 1367399
URL: http://svn.apache.org/viewvc?rev=1367399&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-522
Modified:
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/utils/OutputUtils.java
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java?rev=1367399&r1=1367398&r2=1367399&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java Tue Jul 31 02:44:18 2012
@@ -21,7 +21,12 @@
package org.apache.airavata.core.gfac.provider.impl;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -49,8 +54,6 @@ import org.apache.airavata.core.gfac.uti
import org.apache.airavata.core.gfac.utils.OutputUtils;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
-import org.apache.airavata.schemas.gfac.StdErrParameterType;
-import org.apache.airavata.schemas.gfac.StdOutParameterType;
import org.apache.airavata.schemas.gfac.URIArrayType;
import org.apache.airavata.schemas.gfac.URIParameterType;
import org.apache.airavata.schemas.wec.WorkflowOutputDataHandlingDocument;
@@ -336,17 +339,13 @@ public class GramProvider extends Abstra
}
return stringMap;
}catch (XmlException e) {
-// invocationContext.getExecutionContext().getNotifier().executionFail(invocationContext,e,readLastLinesofStdOut(localStdErrFile.getPath(), 20));
throw new ProviderException(e.getMessage(), e,invocationContext,readLastLinesofStdOut(localStdErrFile.getPath(), 20));
}
catch (ToolsException e) {
-// invocationContext.getExecutionContext().getNotifier().executionFail(invocationContext,e,readLastLinesofStdOut(localStdErrFile.getPath(), 20));
throw new ProviderException(e.getMessage(), e,invocationContext,readLastLinesofStdOut(localStdErrFile.getPath(), 20));
} catch (URISyntaxException e) {
-// invocationContext.getExecutionContext().getNotifier().executionFail(invocationContext,e,readLastLinesofStdOut(localStdErrFile.getPath(), 20));
throw new ProviderException("URI is malformatted:" + e.getMessage(), e, invocationContext,readLastLinesofStdOut(localStdErrFile.getPath(), 20));
}catch (NullPointerException e) {
-// invocationContext.getExecutionContext().getNotifier().executionFail(invocationContext,e,e.getMessage());
throw new ProviderException("Output is not produced in stdout:" + e.getMessage(), e, invocationContext, readLastLinesofStdOut(localStdErrFile.getPath(), 20));
}
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java?rev=1367399&r1=1367398&r2=1367399&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java Tue Jul 31 02:44:18 2012
@@ -186,6 +186,8 @@ public class LocalProvider extends Abstr
throw new ProviderException("Cannot read output:" + e.getMessage(), e, context);
} catch (IOException io) {
throw new ProviderException(io.getMessage(), io, context);
+ } catch (Exception e){
+ throw new ProviderException("Error in retrieving results",e,context);
}
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java?rev=1367399&r1=1367398&r2=1367399&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java Tue Jul 31 02:44:18 2012
@@ -258,6 +258,8 @@ public class SSHProvider extends Abstrac
throw new ProviderException(e.getMessage(), e, context);
} catch (IOException e) {
throw new ProviderException(e.getMessage(), e, context);
+ } catch (Exception e){
+ throw new ProviderException("Error in retrieving results",e,context);
}
}
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=1367399&r1=1367398&r2=1367399&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 Tue Jul 31 02:44:18 2012
@@ -40,7 +40,7 @@ public class OutputUtils {
private OutputUtils() {
}
- public static Map<String, ActualParameter> fillOutputFromStdout(MessageContext<ActualParameter> outMessage, String stdout, String stderr) throws XmlException{
+ public static Map<String, ActualParameter> fillOutputFromStdout(MessageContext<ActualParameter> outMessage, String stdout, String stderr) throws Exception{
Map<String, ActualParameter> result = new HashMap<String, ActualParameter>();
@@ -72,7 +72,7 @@ public class OutputUtils {
return result;
}
- private static String parseStdout(String stdout, String outParam)throws NullPointerException {
+ private static String parseStdout(String stdout, String outParam)throws Exception {
String regex = Pattern.quote(outParam) + "\\s*=\\s*([^\\[\\s'\"][^\\s]*|\"[^\"]*\"|'[^']*'|\\[[^\\[]*\\])";
String match = null;
Pattern pattern = Pattern.compile(regex);
@@ -84,7 +84,7 @@ public class OutputUtils {
match = match.trim();
return match;
} else {
- throw new NullPointerException();
+ throw new Exception("Data for the output parameter '"+outParam+"' was not found");
}
}
}