You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/05/21 15:54:39 UTC
git commit: update outputs for local provider. AIRAVATA-1185
Repository: airavata
Updated Branches:
refs/heads/master 1bb816a82 -> 179367235
update outputs for local provider. AIRAVATA-1185
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/17936723
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/17936723
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/17936723
Branch: refs/heads/master
Commit: 179367235edb374d763bf27e0e54bc2d6fce3d0a
Parents: 1bb816a
Author: raminder <ra...@apache.org>
Authored: Wed May 21 09:54:22 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed May 21 09:54:22 2014 -0400
----------------------------------------------------------------------
.../airavata/gfac/local/provider/impl/LocalProvider.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/17936723/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
index 8e78f5a..9939c84 100644
--- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
+++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
@@ -40,8 +40,13 @@ import org.apache.airavata.gfac.core.utils.GFacUtils;
import org.apache.airavata.gfac.core.utils.OutputUtils;
import org.apache.airavata.gfac.local.utils.InputStreamToFileWriter;
import org.apache.airavata.gfac.local.utils.InputUtils;
+import org.apache.airavata.model.workspace.experiment.DataObjectType;
+import org.apache.airavata.model.workspace.experiment.DataTransferDetails;
import org.apache.airavata.model.workspace.experiment.JobDetails;
import org.apache.airavata.model.workspace.experiment.JobState;
+import org.apache.airavata.model.workspace.experiment.TransferState;
+import org.apache.airavata.model.workspace.experiment.TransferStatus;
+import org.apache.airavata.registry.cpi.ChildDataType;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.NameValuePairType;
import org.apache.xmlbeans.XmlException;
@@ -207,10 +212,12 @@ public class LocalProvider extends AbstractProvider {
ApplicationDeploymentDescriptionType app = jobExecutionContext.getApplicationContext().getApplicationDeploymentDescription().getType();
try {
+ List<DataObjectType> outputArray = new ArrayList<DataObjectType>();
String stdOutStr = GFacUtils.readFileToString(app.getStandardOutput());
String stdErrStr = GFacUtils.readFileToString(app.getStandardError());
Map<String, Object> output = jobExecutionContext.getOutMessageContext().getParameters();
- OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr);
+ OutputUtils.fillOutputFromStdout1(output, stdOutStr, stdErrStr, outputArray);
+ registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID());
} catch (XmlException e) {
throw new GFacProviderException("Cannot read output:" + e.getMessage(), e);
} catch (IOException io) {