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/03/12 21:13:53 UTC
[2/3] git commit: updated the direcotry location. AIRAVATA-1076
updated the direcotry location. AIRAVATA-1076
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/89ac4f93
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/89ac4f93
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/89ac4f93
Branch: refs/heads/master
Commit: 89ac4f93df8c22f54baac8529723d2702f2fa622
Parents: 53977e3
Author: raminder <ra...@apache.org>
Authored: Wed Mar 12 16:12:54 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Mar 12 16:12:54 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/Constants.java | 4 ++--
.../airavata/gfac/handler/AppDescriptorCheckHandler.java | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/89ac4f93/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
index b0e17c0..5f1af68 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
@@ -39,8 +39,8 @@ public class Constants {
public static final String GFAC_CONFIG_CLASS_ATTRIBUTE = "class";
public static final String GFAC_CONFIG_APPLICATION_NAME_ATTRIBUTE = "class";
public static final String NEWLINE = System.getProperty("line.separator");
- public static final String INPUT_DATA_DIR_VAR_NAME = "inputData";
- public static final String OUTPUT_DATA_DIR_VAR_NAME = "outputData";
+ public static final String INPUT_DATA_DIR_VAR_NAME = "input";
+ public static final String OUTPUT_DATA_DIR_VAR_NAME = "output";
public static final int DEFAULT_GSI_FTP_PORT = 2811;
public static final String _127_0_0_1 = "127.0.0.1";
public static final String LOCALHOST = "localhost";
http://git-wip-us.apache.org/repos/asf/airavata/blob/89ac4f93/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
index a3592f8..9afa92f 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
@@ -21,6 +21,7 @@
package org.apache.airavata.gfac.handler;
import org.apache.airavata.commons.gfac.type.ApplicationDescription;
+import org.apache.airavata.gfac.Constants;
import org.apache.airavata.gfac.GFacException;
import org.apache.airavata.gfac.context.JobExecutionContext;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
@@ -56,15 +57,15 @@ public class AppDescriptorCheckHandler implements GFacHandler {
appDesc.setStaticWorkingDirectory(tmpDir);
}
- //FIXME: Move this input/output to application descriptor
+ //FIXME: Move this input/output to application descrpitor
/*
* Input and Output Directory
*/
if (appDesc.getInputDataDirectory() == null || "".equals(appDesc.getInputDataDirectory())) {
- appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "input");
+ appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + Constants.INPUT_DATA_DIR_VAR_NAME);
}
if (appDesc.getOutputDataDirectory() == null || "".equals(appDesc.getOutputDataDirectory())) {
- appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "output");
+ appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + Constants.OUTPUT_DATA_DIR_VAR_NAME);
}
/*