You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/01/12 22:40:17 UTC

[1/4] airavata git commit: changing validity type and addedToCMD to boolean

Repository: airavata
Updated Branches:
  refs/heads/master 97ad96b27 -> f8b6adb7b


http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
index 92cd02c..eca13a6 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
@@ -41,25 +41,25 @@ public class ExperimentOutputResource extends AbstractResource {
     private String experimentKey;
     private String value;
     private String dataType;
-    private String validityType;
+    private boolean isRequired;
     private boolean dataMovement;
     private String dataNameLocation;
-    private String commandLineType;
+    private boolean requiredToCMD;
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
     public boolean isDataMovement() {
@@ -148,8 +148,8 @@ public class ExperimentOutputResource extends AbstractResource {
                 exOutput.setValue(value.toCharArray());
             }
             exOutput.setDataType(dataType);
-            exOutput.setValidityType(validityType);
-            exOutput.setCommandLineType(commandLineType);
+            exOutput.setRequired(isRequired);
+            exOutput.setRequiredToCMD(requiredToCMD);
             exOutput.setDataMovement(dataMovement);
             exOutput.setDataNameLocation(dataNameLocation);
 
@@ -161,8 +161,8 @@ public class ExperimentOutputResource extends AbstractResource {
                 }
                 existingOutput.setExperiment_id(experiment.getExpId());
                 existingOutput.setDataType(dataType);
-                existingOutput.setValidityType(validityType);
-                existingOutput.setCommandLineType(commandLineType);
+                existingOutput.setRequired(isRequired);
+                existingOutput.setRequiredToCMD(requiredToCMD);
                 existingOutput.setDataMovement(dataMovement);
                 existingOutput.setDataNameLocation(dataNameLocation);
                 exOutput = em.merge(existingOutput);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
index 75fe601..4efb8a4 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
@@ -47,24 +47,24 @@ public class NodeInputResource extends AbstractResource {
     private boolean standardInput;
     private String userFriendlyDesc;
     private int inputOrder;
-    private String validityType;
-    private String commandLineType;
+    private boolean isRequired;
+    private boolean requiredToCMD;
     private boolean dataStaged;
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {
@@ -192,8 +192,8 @@ public class NodeInputResource extends AbstractResource {
             nodeInput.setStandardInput(standardInput);
             nodeInput.setUserFriendlyDesc(userFriendlyDesc);
             nodeInput.setInputOrder(inputOrder);
-            nodeInput.setCommandLineType(commandLineType);
-            nodeInput.setValidityType(validityType);
+            nodeInput.setRequiredToCMD(requiredToCMD);
+            nodeInput.setIsRequired(isRequired);
             nodeInput.setDataStaged(dataStaged);
 
             if (existingInput != null){
@@ -207,8 +207,8 @@ public class NodeInputResource extends AbstractResource {
                 existingInput.setStandardInput(standardInput);
                 existingInput.setUserFriendlyDesc(userFriendlyDesc);
                 existingInput.setInputOrder(inputOrder);
-                existingInput.setCommandLineType(commandLineType);
-                existingInput.setValidityType(validityType);
+                existingInput.setRequiredToCMD(requiredToCMD);
+                existingInput.setIsRequired(isRequired);
                 existingInput.setDataStaged(dataStaged);
                 nodeInput = em.merge(existingInput);
             }else {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
index acdf1dc..cbe0dab 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
@@ -42,25 +42,25 @@ public class NodeOutputResource extends AbstractResource {
     private String outputKey;
     private String dataType;
     private String value;
-    private String validityType;
+    private boolean isRequired;
     private boolean dataMovement;
     private String dataNameLocation;
-    private String commandLineType;
+    private boolean requiredToCMD;
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
     public boolean isDataMovement() {
@@ -152,8 +152,8 @@ public class NodeOutputResource extends AbstractResource {
             nodeOutput.setOutputKey(outputKey);
             nodeOutput.setDataType(dataType);
             nodeOutput.setValue(value);
-            nodeOutput.setValidityType(validityType);
-            nodeOutput.setCommandLineType(commandLineType);
+            nodeOutput.setRequired(isRequired);
+            nodeOutput.setRequiredToCMD(requiredToCMD);
             nodeOutput.setDataMovement(dataMovement);
             nodeOutput.setDataNameLocation(dataNameLocation);
 
@@ -163,8 +163,8 @@ public class NodeOutputResource extends AbstractResource {
                 existingOutput.setOutputKey(outputKey);
                 existingOutput.setDataType(dataType);
                 existingOutput.setValue(value);
-                existingOutput.setValidityType(validityType);
-                existingOutput.setCommandLineType(commandLineType);
+                existingOutput.setRequired(isRequired);
+                existingOutput.setRequiredToCMD(requiredToCMD);
                 existingOutput.setDataMovement(dataMovement);
                 existingOutput.setDataNameLocation(dataNameLocation);
                 nodeOutput = em.merge(existingOutput);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index b61a19a..9935e55 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -520,8 +520,8 @@ public class Utils {
             eInputResource.setInputOrder(o.getInputOrder());
             eInputResource.setStandardInput(o.isStandardInput());
             eInputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
-            eInputResource.setValidityType(o.getValidityType());
-            eInputResource.setCommandLineType(o.getCommandLineType());
+            eInputResource.setRequired(o.isRequired());
+            eInputResource.setRequiredToCMD(o.isRequiredToCMD());
             eInputResource.setDataStaged(o.isDataStaged());
 
             if (o.getValue() != null){
@@ -542,8 +542,8 @@ public class Utils {
                 eOutputResource.setValue(new String(o.getValue()));
             }
             eOutputResource.setDataType(o.getDataType());
-            eOutputResource.setValidityType(o.getValidityType());
-            eOutputResource.setCommandLineType(o.getCommandLineType());
+            eOutputResource.setRequired(o.isRequired());
+            eOutputResource.setRequiredToCMD(o.isRequiredToCMD());
             eOutputResource.setDataMovement(o.isDataMovement());
             eOutputResource.setDataNameLocation(o.getDataNameLocation());
         }
@@ -617,8 +617,8 @@ public class Utils {
             inputResource.setInputOrder(o.getInputOrder());
             inputResource.setStandardInput(o.isStandardInput());
             inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
-            inputResource.setValidityType(o.getValidityType());
-            inputResource.setCommandLineType(o.getCommandLineType());
+            inputResource.setRequired(o.isRequired());
+            inputResource.setRequiredToCMD(o.isRequiredToCMD());
             inputResource.setDataStaged(o.isDataStaged());
             if (o.getValue() != null){
                 inputResource.setValue(new String(o.getValue()));
@@ -638,8 +638,8 @@ public class Utils {
             if (o.getValue() != null){
                 outputResource.setValue(new String(o.getValue()));
             }
-            outputResource.setValidityType(o.getValidityType());
-            outputResource.setCommandLineType(o.getCommandLineType());
+            outputResource.setRequired(o.isRequired());
+            outputResource.setRequiredToCMD(o.isAddedToCmd());
             outputResource.setDataMovement(o.isDataMovement());
             outputResource.setDataNameLocation(o.getDataNameLocation());
         }
@@ -659,8 +659,8 @@ public class Utils {
             inputResource.setInputOrder(o.getInputOrder());
             inputResource.setStandardInput(o.isStandardInput());
             inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
-            inputResource.setValidityType(o.getValidityType());
-            inputResource.setCommandLineType(o.getCommandLineType());
+            inputResource.setRequired(o.getIsRequired());
+            inputResource.setRequiredToCMD(o.getRequiredToCMD());
             inputResource.setDataStaged(o.isDataStaged());
         }
         return inputResource;
@@ -674,8 +674,8 @@ public class Utils {
             outputResource.setDataType(o.getDataType());
             outputResource.setOutputKey(o.getOutputKey());
             outputResource.setValue(o.getValue());
-            outputResource.setValidityType(o.getValidityType());
-            outputResource.setCommandLineType(o.getCommandLineType());
+            outputResource.setRequired(o.isRequired());
+            outputResource.setRequiredToCMD(o.isRequiredToCMD());
             outputResource.setDataMovement(o.isDataMovement());
             outputResource.setDataNameLocation(o.getDataNameLocation());
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index 0f87863..4e63656 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -192,12 +192,8 @@ public class ThriftDataModelConversion {
                 dataObjectType.setStandardInput(expInput.isStandardInput());
                 dataObjectType.setUserFriendlyDescription(expInput.getUserFriendlyDesc());
                 dataObjectType.setInputOrder(expInput.getInputOrder());
-                if (expInput.getValidityType() != null){
-                    dataObjectType.setInputValid(ValidityType.valueOf(expInput.getValidityType()));
-                }
-                if (expInput.getCommandLineType() != null){
-                    dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(expInput.getCommandLineType()));
-                }
+                dataObjectType.setIsRequired(expInput.getRequired());
+                dataObjectType.setRequiredToAddedToCommandLine(expInput.getRequiredToCMD());
                 dataObjectType.setDataStaged(expInput.isDataStaged());
                 return dataObjectType;
             }else if (object instanceof NodeInputResource){
@@ -212,12 +208,8 @@ public class ThriftDataModelConversion {
                 dataObjectType.setStandardInput(nodeInputResource.isStandardInput());
                 dataObjectType.setUserFriendlyDescription(nodeInputResource.getUserFriendlyDesc());
                 dataObjectType.setInputOrder(nodeInputResource.getInputOrder());
-                if (nodeInputResource.getValidityType() != null){
-                    dataObjectType.setInputValid(ValidityType.valueOf(nodeInputResource.getValidityType()));
-                }
-                if (nodeInputResource.getCommandLineType() != null){
-                    dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(nodeInputResource.getCommandLineType()));
-                }
+                dataObjectType.setIsRequired(nodeInputResource.getRequired());
+                dataObjectType.setRequiredToAddedToCommandLine(nodeInputResource.getRequiredToCMD());
                 dataObjectType.setDataStaged(nodeInputResource.isDataStaged());
                 return dataObjectType;
             }else if (object instanceof ApplicationInputResource){
@@ -232,12 +224,8 @@ public class ThriftDataModelConversion {
                 dataObjectType.setStandardInput(inputResource.isStandardInput());
                 dataObjectType.setUserFriendlyDescription(inputResource.getUserFriendlyDesc());
                 dataObjectType.setInputOrder(inputResource.getInputOrder());
-                if (inputResource.getValidityType() != null){
-                    dataObjectType.setInputValid(ValidityType.valueOf(inputResource.getValidityType()));
-                }
-                if (inputResource.getCommandLineType() != null){
-                    dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(inputResource.getCommandLineType()));
-                }
+                dataObjectType.setIsRequired(inputResource.isRequired());
+                dataObjectType.setRequiredToAddedToCommandLine(inputResource.isRequiredToCMD());
                 dataObjectType.setDataStaged(inputResource.isDataStaged());
                 return dataObjectType;
             }else {
@@ -257,12 +245,8 @@ public class ThriftDataModelConversion {
                 if (expOutput.getDataType() != null){
                     dataObjectType.setType(DataType.valueOf(expOutput.getDataType()));
                 }
-                if (expOutput.getValidityType() != null){
-                    dataObjectType.setValidityType(ValidityType.valueOf(expOutput.getValidityType()));
-                }
-                if (expOutput.getCommandLineType() != null){
-                    dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(expOutput.getCommandLineType()));
-                }
+                dataObjectType.setIsRequired(expOutput.getRequired());
+                dataObjectType.setRequiredToAddedToCommandLine(expOutput.getRequiredToCMD());
                 dataObjectType.setDataMovement(expOutput.isDataMovement());
                 dataObjectType.setDataNameLocation(expOutput.getDataNameLocation());
                 return dataObjectType;
@@ -273,12 +257,8 @@ public class ThriftDataModelConversion {
                 if (nodeOutputResource.getDataType() != null){
                     dataObjectType.setType(DataType.valueOf(nodeOutputResource.getDataType()));
                 }
-                if (nodeOutputResource.getValidityType() != null){
-                    dataObjectType.setValidityType(ValidityType.valueOf(nodeOutputResource.getValidityType()));
-                }
-                if (nodeOutputResource.getCommandLineType() != null){
-                    dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(nodeOutputResource.getCommandLineType()));
-                }
+                dataObjectType.setIsRequired(nodeOutputResource.getRequired());
+                dataObjectType.setRequiredToAddedToCommandLine(nodeOutputResource.getRequiredToCMD());
                 dataObjectType.setDataMovement(nodeOutputResource.isDataMovement());
                 dataObjectType.setDataNameLocation(nodeOutputResource.getDataNameLocation());
                 return dataObjectType;
@@ -286,15 +266,11 @@ public class ThriftDataModelConversion {
                 ApplicationOutputResource outputResource = (ApplicationOutputResource)object;
                 dataObjectType.setName(outputResource.getOutputKey());
                 dataObjectType.setValue(outputResource.getValue());
+                dataObjectType.setIsRequired(outputResource.isRequired());
+                dataObjectType.setRequiredToAddedToCommandLine(outputResource.isRequiredToCMD());
                 if (outputResource.getDataType() != null){
                     dataObjectType.setType(DataType.valueOf(outputResource.getDataType()));
                 }
-                if (outputResource.getValidityType() != null){
-                    dataObjectType.setValidityType(ValidityType.valueOf(outputResource.getValidityType()));
-                }
-                if (outputResource.getCommandLineType() != null){
-                    dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(outputResource.getCommandLineType()));
-                }
                 dataObjectType.setDataMovement(outputResource.isDataMovement());
                 dataObjectType.setDataNameLocation(outputResource.getDataNameLocation());
                 return dataObjectType;

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
index ca78551..8f31a3f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
@@ -132,8 +132,8 @@ CREATE TABLE EXPERIMENT_INPUT
         USER_FRIENDLY_DESC VARCHAR(255),
         VALUE CLOB,
         INPUT_ORDER INTEGER,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_STAGED SMALLINT,
         PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
@@ -145,8 +145,8 @@ CREATE TABLE EXPERIMENT_OUTPUT
         OUTPUT_KEY VARCHAR(255) NOT NULL,
         DATA_TYPE VARCHAR(255),
         VALUE CLOB,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_MOVEMENT SMALLINT,
         DATA_NAME_LOCATION VARCHAR(255),
         PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
@@ -209,8 +209,8 @@ CREATE TABLE APPLICATION_INPUT
         USER_FRIENDLY_DESC VARCHAR(255),
         VALUE CLOB,
         INPUT_ORDER INTEGER,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_STAGED SMALLINT,
         PRIMARY KEY(TASK_ID,INPUT_KEY),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
@@ -222,8 +222,8 @@ CREATE TABLE APPLICATION_OUTPUT
         OUTPUT_KEY VARCHAR(255) NOT NULL,
         DATA_TYPE VARCHAR(255),
         VALUE CLOB,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_MOVEMENT SMALLINT,
         DATA_NAME_LOCATION VARCHAR(255),
         PRIMARY KEY(TASK_ID,OUTPUT_KEY),
@@ -241,8 +241,8 @@ CREATE TABLE NODE_INPUT
        USER_FRIENDLY_DESC VARCHAR(255),
        VALUE VARCHAR(255),
        INPUT_ORDER INTEGER,
-       VALIDITY_TYPE VARCHAR(255),
-       COMMANDLINE_TYPE VARCHAR(255),
+       IS_REQUIRED SMALLINT,
+       REQUIRED_TO_COMMANDLINE SMALLINT,
        DATA_STAGED SMALLINT,
        PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
        FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
@@ -254,8 +254,8 @@ CREATE TABLE NODE_OUTPUT
        OUTPUT_KEY VARCHAR(255) NOT NULL,
        DATA_TYPE VARCHAR(255),
        VALUE VARCHAR(255),
-       VALIDITY_TYPE VARCHAR(255),
-       COMMANDLINE_TYPE VARCHAR(255),
+       IS_REQUIRED SMALLINT,
+       REQUIRED_TO_COMMANDLINE SMALLINT,
        DATA_MOVEMENT SMALLINT,
        DATA_NAME_LOCATION VARCHAR(255),
        PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
@@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        TRANSFER_DESC CLOB NOT NULL,
+        TRANSFER_DESC VARCHAR(255) NOT NULL,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
index ccc82ff..374db98 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
@@ -132,8 +132,8 @@ CREATE TABLE EXPERIMENT_INPUT
         METADATA VARCHAR(255),
         VALUE LONGTEXT,
         INPUT_ORDER INTEGER,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_STAGED SMALLINT,
         PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
@@ -145,8 +145,8 @@ CREATE TABLE EXPERIMENT_OUTPUT
         OUTPUT_KEY VARCHAR(255) NOT NULL,
         DATA_TYPE VARCHAR(255),
         VALUE LONGTEXT,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_MOVEMENT SMALLINT,
         DATA_NAME_LOCATION VARCHAR(255),
         PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
@@ -190,8 +190,8 @@ CREATE TABLE APPLICATION_INPUT
         METADATA VARCHAR(255),
         VALUE LONGTEXT,
         INPUT_ORDER INTEGER,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_STAGED SMALLINT,
         PRIMARY KEY(TASK_ID,INPUT_KEY),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
@@ -203,9 +203,9 @@ CREATE TABLE APPLICATION_OUTPUT
         OUTPUT_KEY VARCHAR(255) NOT NULL,
         DATA_TYPE VARCHAR(255),
         VALUE LONGTEXT,
-        VALIDITY_TYPE VARCHAR(255),
         DATA_MOVEMENT SMALLINT,
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_NAME_LOCATION VARCHAR(255),
         PRIMARY KEY(TASK_ID,OUTPUT_KEY),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
@@ -222,8 +222,8 @@ CREATE TABLE NODE_INPUT
        METADATA VARCHAR(255),
        VALUE VARCHAR(255),
        INPUT_ORDER INTEGER,
-       VALIDITY_TYPE VARCHAR(255),
-       COMMANDLINE_TYPE VARCHAR(255),
+       IS_REQUIRED SMALLINT,
+       REQUIRED_TO_COMMANDLINE SMALLINT,
        DATA_STAGED SMALLINT,
        PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
        FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
@@ -235,8 +235,8 @@ CREATE TABLE NODE_OUTPUT
        OUTPUT_KEY VARCHAR(255) NOT NULL,
        DATA_TYPE VARCHAR(255),
        VALUE VARCHAR(255),
-       VALIDITY_TYPE VARCHAR(255),
-       COMMANDLINE_TYPE VARCHAR(255),
+       IS_REQUIRED SMALLINT,
+       REQUIRED_TO_COMMANDLINE SMALLINT,
        DATA_MOVEMENT SMALLINT,
        DATA_NAME_LOCATION VARCHAR(255),
        PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
@@ -259,7 +259,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        TRANSFER_DESC LONGTEXT NOT NULL,
+        TRANSFER_DESC VARCHAR(255) NOT NULL,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
index c1bd458..8f31a3f 100644
--- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
@@ -132,8 +132,8 @@ CREATE TABLE EXPERIMENT_INPUT
         USER_FRIENDLY_DESC VARCHAR(255),
         VALUE CLOB,
         INPUT_ORDER INTEGER,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_STAGED SMALLINT,
         PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
@@ -145,7 +145,8 @@ CREATE TABLE EXPERIMENT_OUTPUT
         OUTPUT_KEY VARCHAR(255) NOT NULL,
         DATA_TYPE VARCHAR(255),
         VALUE CLOB,
-        VALIDITY_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_MOVEMENT SMALLINT,
         DATA_NAME_LOCATION VARCHAR(255),
         PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
@@ -208,8 +209,8 @@ CREATE TABLE APPLICATION_INPUT
         USER_FRIENDLY_DESC VARCHAR(255),
         VALUE CLOB,
         INPUT_ORDER INTEGER,
-        VALIDITY_TYPE VARCHAR(255),
-        COMMANDLINE_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_STAGED SMALLINT,
         PRIMARY KEY(TASK_ID,INPUT_KEY),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
@@ -221,7 +222,8 @@ CREATE TABLE APPLICATION_OUTPUT
         OUTPUT_KEY VARCHAR(255) NOT NULL,
         DATA_TYPE VARCHAR(255),
         VALUE CLOB,
-        VALIDITY_TYPE VARCHAR(255),
+        IS_REQUIRED SMALLINT,
+        REQUIRED_TO_COMMANDLINE SMALLINT,
         DATA_MOVEMENT SMALLINT,
         DATA_NAME_LOCATION VARCHAR(255),
         PRIMARY KEY(TASK_ID,OUTPUT_KEY),
@@ -239,8 +241,8 @@ CREATE TABLE NODE_INPUT
        USER_FRIENDLY_DESC VARCHAR(255),
        VALUE VARCHAR(255),
        INPUT_ORDER INTEGER,
-       VALIDITY_TYPE VARCHAR(255),
-       COMMANDLINE_TYPE VARCHAR(255),
+       IS_REQUIRED SMALLINT,
+       REQUIRED_TO_COMMANDLINE SMALLINT,
        DATA_STAGED SMALLINT,
        PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
        FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
@@ -252,7 +254,8 @@ CREATE TABLE NODE_OUTPUT
        OUTPUT_KEY VARCHAR(255) NOT NULL,
        DATA_TYPE VARCHAR(255),
        VALUE VARCHAR(255),
-       VALIDITY_TYPE VARCHAR(255),
+       IS_REQUIRED SMALLINT,
+       REQUIRED_TO_COMMANDLINE SMALLINT,
        DATA_MOVEMENT SMALLINT,
        DATA_NAME_LOCATION VARCHAR(255),
        PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
@@ -275,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL
         TRANSFER_ID VARCHAR(255),
         TASK_ID VARCHAR(255),
         CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        TRANSFER_DESC CLOB NOT NULL,
+        TRANSFER_DESC VARCHAR(255) NOT NULL,
         PRIMARY KEY(TRANSFER_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );


[2/4] airavata git commit: changing validity type and addedToCMD to boolean

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
index 29091d5..472b0d7 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
@@ -22,7 +22,6 @@ package org.apache.airavata.gfac.ssh.handler;
 
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.gfac.GFacException;
-import org.apache.airavata.gfac.SecurityContext;
 import org.apache.airavata.gfac.core.context.JobExecutionContext;
 import org.apache.airavata.gfac.core.handler.AbstractHandler;
 import org.apache.airavata.gfac.core.handler.GFacHandlerException;
@@ -34,10 +33,8 @@ import org.apache.airavata.gsi.ssh.api.SSHApiException;
 import org.apache.airavata.gsi.ssh.api.authentication.AuthenticationInfo;
 import org.apache.airavata.gsi.ssh.impl.authentication.DefaultPasswordAuthenticationInfo;
 import org.apache.airavata.gsi.ssh.impl.authentication.DefaultPublicKeyFileAuthentication;
-import org.apache.airavata.model.appcatalog.appinterface.CommandLineType;
 import org.apache.airavata.model.appcatalog.appinterface.DataType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.appcatalog.appinterface.ValidityType;
 import org.apache.airavata.model.workspace.experiment.CorrectiveAction;
 import org.apache.airavata.model.workspace.experiment.ErrorCategory;
 import org.apache.airavata.registry.cpi.ChildDataType;
@@ -166,8 +163,8 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
                     dataObjectType.setValue(outputPath + File.separatorChar + fileName);
                     dataObjectType.setName(paramName);
                     dataObjectType.setType(DataType.STDOUT);
-                    dataObjectType.setValidityType(ValidityType.REQUIRED);
-                    dataObjectType.setAddedToCommandLine(CommandLineType.IMPLICIT);
+                    dataObjectType.setIsRequired(true);
+                    dataObjectType.setRequiredToAddedToCommandLine(true);
                     outputArray.add(dataObjectType);
                 }else if (outputDataObjectType.getType() == DataType.STDERR) {
                     pbsCluster.scpTo(outputPath, standardError);
@@ -176,8 +173,8 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
                     dataObjectType.setValue(outputPath + File.separatorChar + fileName);
                     dataObjectType.setName(paramName);
                     dataObjectType.setType(DataType.STDERR);
-                    dataObjectType.setValidityType(ValidityType.REQUIRED);
-                    dataObjectType.setAddedToCommandLine(CommandLineType.IMPLICIT);
+                    dataObjectType.setIsRequired(true);
+                    dataObjectType.setRequiredToAddedToCommandLine(true);
                     outputArray.add(dataObjectType);
                 }
              }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
index d649ade..bf2576a 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
@@ -42,7 +42,6 @@ import org.apache.airavata.gsi.ssh.impl.GSISSHAbstractCluster;
 import org.apache.airavata.gsi.ssh.impl.PBSCluster;
 import org.apache.airavata.gsi.ssh.util.CommonUtils;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appinterface.CommandLineType;
 import org.apache.airavata.model.appcatalog.appinterface.DataType;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
@@ -272,8 +271,7 @@ public class GFACSSHUtils {
             }
         }
         for (InputDataObjectType inputDataObjectType : sortedInputSet) {
-            if (inputDataObjectType.getAddedToCommandLine() != null
-                    && inputDataObjectType.getAddedToCommandLine() == CommandLineType.IMPLICIT) {
+            if (!inputDataObjectType.isRequiredToAddedToCommandLine()) {
                 continue;
             }
             if (inputDataObjectType.getApplicationArgument() != null
@@ -298,8 +296,7 @@ public class GFACSSHUtils {
         for (Object outputParam : outputParams.values()) {
             if (outputParam instanceof OutputDataObjectType) {
                 OutputDataObjectType output = (OutputDataObjectType) outputParam;
-                if (output.getValue() != null && !output.getValue().equals("") && output.getAddedToCommandLine() != null
-                        && output.getAddedToCommandLine() == CommandLineType.EXPLICIT) {
+                if (output.getValue() != null && !output.getValue().equals("") && output.isRequiredToAddedToCommandLine()) {
                     inputValues.add(output.getValue());
                 }
             }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index b790ea0..10821bd 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -48,10 +48,10 @@ public class ExperimentRegistry {
 
     public ExperimentRegistry(GatewayResource gateway, UserResource user) throws RegistryException {
         gatewayResource = gateway;
-        if (!gatewayResource.isExists(ResourceType.GATEWAY_WORKER, user.getUserName())){
+        if (!gatewayResource.isExists(ResourceType.GATEWAY_WORKER, user.getUserName())) {
             workerResource = ResourceUtils.addGatewayWorker(gateway, user);
-        }else {
-            workerResource = (WorkerResource)ResourceUtils.getWorker(gateway.getGatewayName(), user.getUserName());
+        } else {
+            workerResource = (WorkerResource) ResourceUtils.getWorker(gateway.getGatewayName(), user.getUserName());
         }
 
     }
@@ -94,8 +94,8 @@ public class ExperimentRegistry {
             }
 
             List<OutputDataObjectType> experimentOutputs = experiment.getExperimentOutputs();
-            if (experimentOutputs != null && !experimentOutputs.isEmpty()){
-            	//TODO: short change.
+            if (experimentOutputs != null && !experimentOutputs.isEmpty()) {
+                //TODO: short change.
 //                for (DataObjectType output : experimentOutputs){
 //                    output.setValue("");
 //                }
@@ -112,14 +112,14 @@ public class ExperimentRegistry {
 //            }
 
             List<WorkflowNodeDetails> workflowNodeDetailsList = experiment.getWorkflowNodeDetailsList();
-            if (workflowNodeDetailsList != null && !workflowNodeDetailsList.isEmpty()){
-                for (WorkflowNodeDetails wf : workflowNodeDetailsList){
+            if (workflowNodeDetailsList != null && !workflowNodeDetailsList.isEmpty()) {
+                for (WorkflowNodeDetails wf : workflowNodeDetailsList) {
                     addWorkflowNodeDetails(wf, experimentID);
                 }
             }
             List<ErrorDetails> errors = experiment.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails errror : errors){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails errror : errors) {
                     addErrorDetails(errror, experimentID);
                 }
             }
@@ -270,18 +270,14 @@ public class ExperimentRegistry {
                 resource.setExperimentResource(experimentResource);
                 resource.setExperimentKey(input.getName());
                 resource.setValue(input.getValue());
-                if (input.getType() != null){
+                if (input.getType() != null) {
                     resource.setDataType(input.getType().toString());
                 }
                 resource.setMetadata(input.getMetaData());
                 resource.setAppArgument(input.getApplicationArgument());
                 resource.setInputOrder(input.getInputOrder());
-                if (input.getInputValid() != null){
-                    resource.setValidityType(input.getInputValid().toString());
-                }
-                if (input.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(input.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(input.isIsRequired());
+                resource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                 resource.save();
             }
         } catch (Exception e) {
@@ -297,18 +293,14 @@ public class ExperimentRegistry {
                 for (ExperimentInputResource exinput : experimentInputs) {
                     if (exinput.getExperimentKey().equals(input.getName())) {
                         exinput.setValue(input.getValue());
-                        if (input.getType() != null){
+                        if (input.getType() != null) {
                             exinput.setDataType(input.getType().toString());
                         }
                         exinput.setMetadata(input.getMetaData());
                         exinput.setAppArgument(input.getApplicationArgument());
                         exinput.setInputOrder(input.getInputOrder());
-                        if (input.getInputValid() != null){
-                            exinput.setValidityType(input.getInputValid().toString());
-                        }
-                        if (input.getAddedToCommandLine() != null){
-                            exinput.setCommandLineType(input.getAddedToCommandLine().toString());
-                        }
+                        exinput.setRequired(input.isIsRequired());
+                        exinput.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                         exinput.save();
                     }
                 }
@@ -328,15 +320,11 @@ public class ExperimentRegistry {
                 resource.setExperimentResource(experiment);
                 resource.setExperimentKey(output.getName());
                 resource.setValue(output.getValue());
-                if (output.getType() != null){
+                if (output.getType() != null) {
                     resource.setDataType(output.getType().toString());
                 }
-                if (output.getValidityType() != null){
-                    resource.setValidityType(output.getValidityType().toString());
-                }
-                if (output.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(output.isIsRequired());
+                resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                 resource.setDataMovement(output.isDataMovement());
                 resource.setDataNameLocation(output.getDataNameLocation());
 //                resource.setMetadata(output.get());
@@ -359,15 +347,11 @@ public class ExperimentRegistry {
                         resource.setExperimentResource(experiment);
                         resource.setExperimentKey(output.getName());
                         resource.setValue(output.getValue());
-                        if (output.getType() != null){
+                        if (output.getType() != null) {
                             resource.setDataType(output.getType().toString());
                         }
-                        if (output.getValidityType() != null){
-                            resource.setValidityType(output.getValidityType().toString());
-                        }
-                        if (output.getAddedToCommandLine() != null){
-                            resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                        }
+                        resource.setRequired(output.isIsRequired());
+                        resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                         resource.setDataMovement(output.isDataMovement());
                         resource.setDataNameLocation(output.getDataNameLocation());
 //                        resource.setMetadata(output.getMetaData());
@@ -390,15 +374,11 @@ public class ExperimentRegistry {
                 resource.setNodeDetailResource(workflowNode);
                 resource.setOutputKey(output.getName());
                 resource.setValue(output.getValue());
-                if (output.getType() != null){
+                if (output.getType() != null) {
                     resource.setDataType(output.getType().toString());
                 }
-                if (output.getValidityType() != null){
-                    resource.setValidityType(output.getValidityType().toString());
-                }
-                if (output.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(output.isIsRequired());
+                resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                 resource.setDataMovement(output.isDataMovement());
                 resource.setDataNameLocation(output.getDataNameLocation());
 //                resource.setMetadata(output.getMetaData());
@@ -421,15 +401,11 @@ public class ExperimentRegistry {
                     resource.setNodeDetailResource(workflowNode);
                     resource.setOutputKey(output.getName());
                     resource.setValue(output.getValue());
-                    if (output.getType() != null){
+                    if (output.getType() != null) {
                         resource.setDataType(output.getType().toString());
                     }
-                    if (output.getValidityType() != null){
-                        resource.setValidityType(output.getValidityType().toString());
-                    }
-                    if (output.getAddedToCommandLine() != null){
-                        resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                    }
+                    resource.setRequired(output.isIsRequired());
+                    resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                     resource.setDataMovement(output.isDataMovement());
                     resource.setDataNameLocation(output.getDataNameLocation());
 //                    resource.setMetadata(output.getMetaData());
@@ -452,15 +428,11 @@ public class ExperimentRegistry {
                 resource.setTaskDetailResource(taskDetail);
                 resource.setOutputKey(output.getName());
                 resource.setValue(output.getValue());
-                if (output.getType() != null){
+                if (output.getType() != null) {
                     resource.setDataType(output.getType().toString());
                 }
-                if (output.getValidityType() != null){
-                    resource.setValidityType(output.getValidityType().toString());
-                }
-                if (output.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(output.isIsRequired());
+                resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                 resource.setDataMovement(output.isDataMovement());
                 resource.setDataNameLocation(output.getDataNameLocation());
 //                resource.setMetadata(output.getMetaData());
@@ -482,7 +454,7 @@ public class ExperimentRegistry {
             }
             status.setExperimentResource(experiment);
             status.setStatusUpdateTime(AiravataUtils.getTime(experimentStatus.getTimeOfStateChange()));
-            if (experimentStatus.getExperimentState() == null){
+            if (experimentStatus.getExperimentState() == null) {
                 status.setState(ExperimentState.UNKNOWN.toString());
             } else {
                 status.setState(experimentStatus.getExperimentState().toString());
@@ -506,7 +478,7 @@ public class ExperimentRegistry {
             statusResource.setWorkflowNodeDetail(workflowNode);
             statusResource.setStatusType(StatusType.WORKFLOW_NODE.toString());
             statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange()));
-            if (status.getWorkflowNodeState() == null){
+            if (status.getWorkflowNodeState() == null) {
                 statusResource.setState(WorkflowNodeState.UNKNOWN.toString());
             } else {
                 statusResource.setState(status.getWorkflowNodeState().toString());
@@ -524,8 +496,8 @@ public class ExperimentRegistry {
             ExperimentResource experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
             WorkflowNodeDetailResource workflowNode = experiment.getWorkflowNode(nodeId);
             StatusResource statusResource = workflowNode.getWorkflowNodeStatus();
-            if (statusResource == null){
-                statusResource = (StatusResource)workflowNode.create(ResourceType.STATUS);
+            if (statusResource == null) {
+                statusResource = (StatusResource) workflowNode.create(ResourceType.STATUS);
             }
             statusResource.setExperimentResource(workflowNode.getExperimentResource());
             statusResource.setWorkflowNodeDetail(workflowNode);
@@ -552,7 +524,7 @@ public class ExperimentRegistry {
             statusResource.setTaskDetailResource(taskDetail);
             statusResource.setStatusType(StatusType.TASK.toString());
             statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange()));
-            if (status.getExecutionState() == null){
+            if (status.getExecutionState() == null) {
                 statusResource.setState(TaskState.UNKNOWN.toString());
             } else {
                 statusResource.setState(status.getExecutionState().toString());
@@ -571,10 +543,10 @@ public class ExperimentRegistry {
             WorkflowNodeDetailResource workflowNode = (WorkflowNodeDetailResource) experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
             TaskDetailResource taskDetail = workflowNode.getTaskDetail(taskId);
             StatusResource statusResource;
-            if (taskDetail.isTaskStatusExist(taskId)){
+            if (taskDetail.isTaskStatusExist(taskId)) {
                 statusResource = taskDetail.getWorkflowNodeDetailResource().getTaskStatus(taskId);
             } else {
-                statusResource = (StatusResource)taskDetail.create(ResourceType.STATUS);
+                statusResource = (StatusResource) taskDetail.create(ResourceType.STATUS);
             }
             statusResource.setExperimentResource(taskDetail.getWorkflowNodeDetailResource().getExperimentResource());
             statusResource.setWorkflowNodeDetail(taskDetail.getWorkflowNodeDetailResource());
@@ -607,7 +579,7 @@ public class ExperimentRegistry {
             statusResource.setTaskDetailResource(taskDetail);
             statusResource.setStatusType(StatusType.JOB.toString());
             statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange()));
-            if (status.getJobState() == null){
+            if (status.getJobState() == null) {
                 statusResource.setState(JobState.UNKNOWN.toString());
             } else {
                 statusResource.setState(status.getJobState().toString());
@@ -624,8 +596,8 @@ public class ExperimentRegistry {
         try {
             ExperimentResource experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
             WorkflowNodeDetailResource workflowNode = (WorkflowNodeDetailResource) experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
-            TaskDetailResource taskDetail = workflowNode.getTaskDetail((String)ids.getTopLevelIdentifier());
-            JobDetailResource jobDetail = taskDetail.getJobDetail((String)ids.getSecondLevelIdentifier());
+            TaskDetailResource taskDetail = workflowNode.getTaskDetail((String) ids.getTopLevelIdentifier());
+            JobDetailResource jobDetail = taskDetail.getJobDetail((String) ids.getSecondLevelIdentifier());
             StatusResource statusResource = jobDetail.getJobStatus();
             workflowNode = taskDetail.getWorkflowNodeDetailResource();
             experiment = workflowNode.getExperimentResource();
@@ -661,7 +633,7 @@ public class ExperimentRegistry {
             statusResource.setTaskDetailResource(taskDetail);
             statusResource.setStatusType(StatusType.APPLICATION.toString());
             statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange()));
-            if (status.getApplicationState() == null){
+            if (status.getApplicationState() == null) {
                 statusResource.setState("UNKNOWN");
             } else {
                 statusResource.setState(status.getApplicationState());
@@ -713,7 +685,7 @@ public class ExperimentRegistry {
             statusResource.setDataTransferDetail(dataTransferDetail);
             statusResource.setStatusType(StatusType.DATA_TRANSFER.toString());
             statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange()));
-            if (status.getTransferState() ==  null){
+            if (status.getTransferState() == null) {
                 statusResource.setState(TransferState.UNKNOWN.toString());
             } else {
                 statusResource.setState(status.getTransferState().toString());
@@ -733,11 +705,11 @@ public class ExperimentRegistry {
             TaskDetailResource taskDetail = (TaskDetailResource) workflowNode.create(ResourceType.TASK_DETAIL);
             DataTransferDetailResource dataTransferDetail = taskDetail.getDataTransferDetail(transferId);
             StatusResource statusResource = dataTransferDetail.getDataTransferStatus();
-        
+
             WorkflowNodeDetailResource workflowNodeDetailResource = dataTransferDetail.getTaskDetailResource().getWorkflowNodeDetailResource();
-            if(workflowNodeDetailResource != null){
-            	statusResource.setExperimentResource(workflowNodeDetailResource.getExperimentResource());
-            	statusResource.setWorkflowNodeDetail(workflowNodeDetailResource);
+            if (workflowNodeDetailResource != null) {
+                statusResource.setExperimentResource(workflowNodeDetailResource.getExperimentResource());
+                statusResource.setWorkflowNodeDetail(workflowNodeDetailResource);
             }
             statusResource.setTaskDetailResource(dataTransferDetail.getTaskDetailResource());
             statusResource.setDataTransferDetail(dataTransferDetail);
@@ -768,13 +740,13 @@ public class ExperimentRegistry {
                 addWorkflowInputs(nodeDetails.getNodeInputs(), resource);
             }
             List<OutputDataObjectType> nodeOutputs = nodeDetails.getNodeOutputs();
-            if (nodeOutputs != null && !nodeOutputs.isEmpty()){
+            if (nodeOutputs != null && !nodeOutputs.isEmpty()) {
                 CompositeIdentifier ids = new CompositeIdentifier(expId, nodeId);
                 addNodeOutputs(nodeOutputs, ids);
             }
             WorkflowNodeStatus workflowNodeStatus = nodeDetails.getWorkflowNodeStatus();
             CompositeIdentifier ids = new CompositeIdentifier(expId, nodeId);
-            if (workflowNodeStatus == null ){
+            if (workflowNodeStatus == null) {
                 workflowNodeStatus = new WorkflowNodeStatus();
             }
 //                if (workflowNodeStatus.getWorkflowNodeState() != null){
@@ -791,14 +763,14 @@ public class ExperimentRegistry {
             workflowNodeStatus.setWorkflowNodeState(WorkflowNodeState.UNKNOWN);
             addWorkflowNodeStatus(workflowNodeStatus, ids);
             List<TaskDetails> taskDetails = nodeDetails.getTaskDetailsList();
-            if (taskDetails != null && !taskDetails.isEmpty()){
-                for (TaskDetails task : taskDetails){
+            if (taskDetails != null && !taskDetails.isEmpty()) {
+                for (TaskDetails task : taskDetails) {
                     addTaskDetails(task, nodeId);
                 }
             }
             List<ErrorDetails> errors = nodeDetails.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails error : errors){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails error : errors) {
                     addErrorDetails(error, nodeId);
                 }
             }
@@ -825,32 +797,32 @@ public class ExperimentRegistry {
                 updateWorkflowInputs(nodeDetails.getNodeInputs(), workflowNode);
             }
             List<OutputDataObjectType> nodeOutputs = nodeDetails.getNodeOutputs();
-            if (nodeOutputs != null && !nodeOutputs.isEmpty()){
+            if (nodeOutputs != null && !nodeOutputs.isEmpty()) {
                 updateNodeOutputs(nodeOutputs, nodeId);
             }
             WorkflowNodeStatus workflowNodeStatus = nodeDetails.getWorkflowNodeStatus();
-            if (workflowNodeStatus != null){
-                if (isWFNodeExist(nodeId)){
+            if (workflowNodeStatus != null) {
+                if (isWFNodeExist(nodeId)) {
                     updateWorkflowNodeStatus(workflowNodeStatus, nodeId);
-                }else {
+                } else {
                     CompositeIdentifier ids = new CompositeIdentifier(expID, nodeId);
-                    addWorkflowNodeStatus(workflowNodeStatus,ids);
+                    addWorkflowNodeStatus(workflowNodeStatus, ids);
                 }
             }
             List<TaskDetails> taskDetails = nodeDetails.getTaskDetailsList();
-            if (taskDetails != null && !taskDetails.isEmpty()){
-                for (TaskDetails task : taskDetails){
+            if (taskDetails != null && !taskDetails.isEmpty()) {
+                for (TaskDetails task : taskDetails) {
                     String taskID = task.getTaskID();
-                    if(isTaskDetailExist(taskID)){
+                    if (isTaskDetailExist(taskID)) {
                         updateTaskDetails(task, taskID);
-                    }else {
+                    } else {
                         addTaskDetails(task, nodeId);
                     }
                 }
             }
             List<ErrorDetails> errors = nodeDetails.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails error : errors){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails error : errors) {
                     addErrorDetails(error, nodeId);
                 }
             }
@@ -868,18 +840,14 @@ public class ExperimentRegistry {
                 resource.setNodeDetailResource(nodeDetailResource);
                 resource.setInputKey(input.getName());
                 resource.setValue(input.getValue());
-                if (input.getType() != null){
+                if (input.getType() != null) {
                     resource.setDataType(input.getType().toString());
                 }
                 resource.setMetadata(input.getMetaData());
                 resource.setAppArgument(input.getApplicationArgument());
                 resource.setInputOrder(input.getInputOrder());
-                if (input.getInputValid() != null){
-                    resource.setValidityType(input.getInputValid().toString());
-                }
-                if (input.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(input.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(input.isIsRequired());
+                resource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                 resource.save();
             }
         } catch (Exception e) {
@@ -897,18 +865,14 @@ public class ExperimentRegistry {
                     resource.setNodeDetailResource(nodeDetailResource);
                     resource.setInputKey(input.getName());
                     resource.setValue(input.getValue());
-                    if (input.getType() != null){
+                    if (input.getType() != null) {
                         resource.setDataType(input.getType().toString());
                     }
                     resource.setMetadata(input.getMetaData());
                     resource.setAppArgument(input.getApplicationArgument());
                     resource.setInputOrder(input.getInputOrder());
-                    if (input.getInputValid() != null){
-                        resource.setValidityType(input.getInputValid().toString());
-                    }
-                    if (input.getAddedToCommandLine() != null){
-                        resource.setCommandLineType(input.getAddedToCommandLine().toString());
-                    }
+                    resource.setRequired(input.isIsRequired());
+                    resource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                     resource.save();
                 }
             }
@@ -952,37 +916,37 @@ public class ExperimentRegistry {
             }
 
             List<JobDetails> jobDetailsList = taskDetails.getJobDetailsList();
-            if (jobDetailsList != null && !jobDetailsList.isEmpty()){
-                for (JobDetails job : jobDetailsList){
+            if (jobDetailsList != null && !jobDetailsList.isEmpty()) {
+                for (JobDetails job : jobDetailsList) {
                     CompositeIdentifier ids = new CompositeIdentifier(taskDetail.getTaskId(), job.getJobID());
-                    addJobDetails(job,ids);
+                    addJobDetails(job, ids);
                 }
             }
 
             List<DataTransferDetails> dataTransferDetailsList = taskDetails.getDataTransferDetailsList();
-            if (dataTransferDetailsList != null && !dataTransferDetailsList.isEmpty()){
-                for (DataTransferDetails transferDetails : dataTransferDetailsList){
+            if (dataTransferDetailsList != null && !dataTransferDetailsList.isEmpty()) {
+                for (DataTransferDetails transferDetails : dataTransferDetailsList) {
                     addDataTransferDetails(transferDetails, taskDetail.getTaskId());
                 }
             }
 
             List<ErrorDetails> errors = taskDetails.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails error : errors){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails error : errors) {
                     addErrorDetails(error, taskDetail.getTaskId());
                 }
             }
 
             TaskStatus taskStatus = taskDetails.getTaskStatus();
             CompositeIdentifier ids = new CompositeIdentifier(nodeId, taskDetail.getTaskId());
-            if (taskStatus != null){
-                if (taskStatus.getExecutionState() != null){
+            if (taskStatus != null) {
+                if (taskStatus.getExecutionState() != null) {
                     addTaskStatus(taskStatus, ids);
-                }else {
+                } else {
                     taskStatus.setExecutionState(TaskState.UNKNOWN);
                     addTaskStatus(taskStatus, ids);
                 }
-            }else {
+            } else {
                 TaskStatus status = new TaskStatus();
                 status.setExecutionState(TaskState.UNKNOWN);
                 addTaskStatus(status, ids);
@@ -1023,29 +987,29 @@ public class ExperimentRegistry {
                 updateOutputDataHandling(outputDataHandling, taskDetail);
             }
             List<JobDetails> jobDetailsList = taskDetails.getJobDetailsList();
-            if (jobDetailsList != null && !jobDetailsList.isEmpty()){
-                for (JobDetails job : jobDetailsList){
+            if (jobDetailsList != null && !jobDetailsList.isEmpty()) {
+                for (JobDetails job : jobDetailsList) {
                     CompositeIdentifier ids = new CompositeIdentifier(taskId, job.getJobID());
                     updateJobDetails(job, ids);
                 }
             }
 
             List<DataTransferDetails> dataTransferDetailsList = taskDetails.getDataTransferDetailsList();
-            if (dataTransferDetailsList != null && !dataTransferDetailsList.isEmpty()){
-                for (DataTransferDetails transferDetails : dataTransferDetailsList){
+            if (dataTransferDetailsList != null && !dataTransferDetailsList.isEmpty()) {
+                for (DataTransferDetails transferDetails : dataTransferDetailsList) {
                     updateDataTransferDetails(transferDetails, transferDetails.getTransferID());
                 }
             }
 
             List<ErrorDetails> errors = taskDetails.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails error : errors){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails error : errors) {
                     addErrorDetails(error, taskDetail.getTaskId());
                 }
             }
 
             TaskStatus taskStatus = taskDetails.getTaskStatus();
-            if (taskStatus != null){
+            if (taskStatus != null) {
                 updateTaskStatus(taskStatus, taskId);
             }
             return taskDetail.getTaskId();
@@ -1062,18 +1026,14 @@ public class ExperimentRegistry {
                 resource.setTaskDetailResource(taskDetailResource);
                 resource.setInputKey(input.getName());
                 resource.setValue(input.getValue());
-                if (input.getType() != null){
+                if (input.getType() != null) {
                     resource.setDataType(input.getType().toString());
                 }
                 resource.setMetadata(input.getMetaData());
                 resource.setAppArgument(input.getApplicationArgument());
                 resource.setInputOrder(input.getInputOrder());
-                if (input.getInputValid() != null){
-                    resource.setValidityType(input.getInputValid().toString());
-                }
-                if (input.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(input.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(input.isIsRequired());
+                resource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                 resource.save();
             }
         } catch (Exception e) {
@@ -1090,15 +1050,11 @@ public class ExperimentRegistry {
                 resource.setTaskDetailResource(taskDetailResource);
                 resource.setOutputKey(output.getName());
                 resource.setValue(output.getValue());
-                if (output.getType() != null){
+                if (output.getType() != null) {
                     resource.setDataType(output.getType().toString());
                 }
-                if (output.getValidityType() != null){
-                    resource.setValidityType(output.getValidityType().toString());
-                }
-                if (output.getAddedToCommandLine() != null){
-                    resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                }
+                resource.setRequired(output.isIsRequired());
+                resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                 resource.setDataMovement(output.isDataMovement());
                 resource.setDataNameLocation(output.getDataNameLocation());
 //                resource.setMetadata(output.getMetaData());
@@ -1122,15 +1078,11 @@ public class ExperimentRegistry {
                     resource.setTaskDetailResource(taskDetail);
                     resource.setOutputKey(output.getName());
                     resource.setValue(output.getValue());
-                    if (output.getType() != null){
+                    if (output.getType() != null) {
                         resource.setDataType(output.getType().toString());
                     }
-                    if (output.getValidityType() != null){
-                        resource.setValidityType(output.getValidityType().toString());
-                    }
-                    if (output.getAddedToCommandLine() != null){
-                        resource.setCommandLineType(output.getAddedToCommandLine().toString());
-                    }
+                    resource.setRequired(output.isIsRequired());
+                    resource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                     resource.setDataMovement(output.isDataMovement());
                     resource.setDataNameLocation(output.getDataNameLocation());
 //                    resource.setMetadata(output.getMetaData());
@@ -1151,18 +1103,14 @@ public class ExperimentRegistry {
                     resource.setTaskDetailResource(taskDetailResource);
                     resource.setInputKey(input.getName());
                     resource.setValue(input.getValue());
-                    if (input.getType() != null){
+                    if (input.getType() != null) {
                         resource.setDataType(input.getType().toString());
                     }
                     resource.setMetadata(input.getMetaData());
                     resource.setAppArgument(input.getApplicationArgument());
                     resource.setInputOrder(input.getInputOrder());
-                    if (input.getInputValid() != null){
-                        resource.setValidityType(input.getInputValid().toString());
-                    }
-                    if (input.getAddedToCommandLine() != null){
-                        resource.setCommandLineType(input.getAddedToCommandLine().toString());
-                    }
+                    resource.setRequired(input.isIsRequired());
+                    resource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                     resource.save();
                 }
 
@@ -1186,26 +1134,26 @@ public class ExperimentRegistry {
             jobDetail.setComputeResourceConsumed(jobDetails.getComputeResourceConsumed());
             jobDetail.save();
             JobStatus jobStatus = jobDetails.getJobStatus();
-            if (jobStatus != null){
+            if (jobStatus != null) {
                 JobStatus status = getJobStatus(ids);
-                if (status != null){
+                if (status != null) {
                     updateJobStatus(jobStatus, ids);
-                }else {
+                } else {
                     addJobStatus(jobStatus, ids);
                 }
             }
             ApplicationStatus applicationStatus = jobDetails.getApplicationStatus();
-            if (applicationStatus != null){
+            if (applicationStatus != null) {
                 ApplicationStatus appStatus = getApplicationStatus(ids);
-                if (appStatus != null){
-                    updateApplicationStatus(applicationStatus, (String)ids.getSecondLevelIdentifier());
-                }else {
+                if (appStatus != null) {
+                    updateApplicationStatus(applicationStatus, (String) ids.getSecondLevelIdentifier());
+                } else {
                     addApplicationStatus(applicationStatus, ids);
                 }
             }
             List<ErrorDetails> errors = jobDetails.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails error : errors ){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails error : errors) {
                     addErrorDetails(error, ids.getSecondLevelIdentifier());
                 }
             }
@@ -1231,26 +1179,26 @@ public class ExperimentRegistry {
             jobDetail.setComputeResourceConsumed(jobDetails.getComputeResourceConsumed());
             jobDetail.save();
             JobStatus jobStatus = jobDetails.getJobStatus();
-            if (jobStatus != null){
+            if (jobStatus != null) {
                 JobStatus status = getJobStatus(ids);
-                if (status != null){
+                if (status != null) {
                     updateJobStatus(jobStatus, ids);
-                }else {
+                } else {
                     addJobStatus(jobStatus, ids);
                 }
             }
             ApplicationStatus applicationStatus = jobDetails.getApplicationStatus();
-            if (applicationStatus != null){
+            if (applicationStatus != null) {
                 ApplicationStatus appStatus = getApplicationStatus(ids);
-                if (appStatus != null){
+                if (appStatus != null) {
                     updateApplicationStatus(applicationStatus, jobId);
-                }else {
+                } else {
                     addApplicationStatus(applicationStatus, ids);
                 }
             }
             List<ErrorDetails> errors = jobDetails.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails error : errors ){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails error : errors) {
                     addErrorDetails(error, jobId);
                 }
             }
@@ -1273,11 +1221,11 @@ public class ExperimentRegistry {
             resource.save();
             String transferId = resource.getTransferId();
             TransferStatus transferStatus = transferDetails.getTransferStatus();
-            if (transferStatus != null){
+            if (transferStatus != null) {
                 TransferStatus status = getDataTransferStatus(transferId);
-                if (status != null){
+                if (status != null) {
                     updateTransferStatus(transferStatus, transferId);
-                }else {
+                } else {
                     CompositeIdentifier ids = new CompositeIdentifier(taskId, transferId);
                     addTransferStatus(transferStatus, ids);
                 }
@@ -1301,11 +1249,11 @@ public class ExperimentRegistry {
             resource.save();
             String taskId = resource.getTaskDetailResource().getTaskId();
             TransferStatus transferStatus = transferDetails.getTransferStatus();
-            if (transferStatus != null){
+            if (transferStatus != null) {
                 TransferStatus status = getDataTransferStatus(transferId);
-                if (status != null){
+                if (status != null) {
                     updateTransferStatus(transferStatus, transferId);
-                }else {
+                } else {
                     CompositeIdentifier ids = new CompositeIdentifier(taskId, transferId);
                     addTransferStatus(transferStatus, ids);
                 }
@@ -1442,16 +1390,16 @@ public class ExperimentRegistry {
 //                    errorResource = (ErrorDetailResource) workflowNode.create(ResourceType.ERROR_DETAIL);
 //                    errorResource.setExperimentResource(workflowNode.getExperimentResource());
 //                } else
-                  if (isTaskDetailExist((String) id)) {
+                if (isTaskDetailExist((String) id)) {
                     experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
                     workflowNode = (WorkflowNodeDetailResource) experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
                     taskDetail = workflowNode.getTaskDetail((String) id);
                     errorResource = (ErrorDetailResource) taskDetail.create(ResourceType.ERROR_DETAIL);
-                    if (error.getErrorID() != null &&  !error.getErrorID().equals(experimentModelConstants.DEFAULT_ID)){
+                    if (error.getErrorID() != null && !error.getErrorID().equals(experimentModelConstants.DEFAULT_ID)) {
                         List<ErrorDetailResource> errorDetailList = taskDetail.getErrorDetailList();
-                        if (errorDetailList != null && !errorDetailList.isEmpty()){
-                            for (ErrorDetailResource errorDetailResource : errorDetailList){
-                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorID())){
+                        if (errorDetailList != null && !errorDetailList.isEmpty()) {
+                            for (ErrorDetailResource errorDetailResource : errorDetailList) {
+                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorID())) {
                                     errorResource = errorDetailResource;
                                 }
                             }
@@ -1471,12 +1419,12 @@ public class ExperimentRegistry {
                     taskDetail = workflowNode.getTaskDetail((String) cid.getTopLevelIdentifier());
                     JobDetailResource jobDetail = taskDetail.getJobDetail((String) cid.getSecondLevelIdentifier());
                     errorResource = (ErrorDetailResource) jobDetail.create(ResourceType.ERROR_DETAIL);
-                    if (error.getErrorID() != null &&  !error.getErrorID().equals(experimentModelConstants.DEFAULT_ID)){
+                    if (error.getErrorID() != null && !error.getErrorID().equals(experimentModelConstants.DEFAULT_ID)) {
                         List<ErrorDetailResource> errorDetailList = taskDetail.getErrorDetailList();
-                        if (errorDetailList != null && !errorDetailList.isEmpty()){
-                            for (ErrorDetailResource errorDetailResource : errorDetailList){
-                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorID())){
-                                       errorResource = errorDetailResource;
+                        if (errorDetailList != null && !errorDetailList.isEmpty()) {
+                            for (ErrorDetailResource errorDetailResource : errorDetailList) {
+                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorID())) {
+                                    errorResource = errorDetailResource;
                                 }
                             }
                         }
@@ -1495,18 +1443,18 @@ public class ExperimentRegistry {
                 errorResource.setCreationTime(AiravataUtils.getTime(error.getCreationTime()));
                 errorResource.setActualErrorMsg(error.getActualErrorMessage());
                 errorResource.setUserFriendlyErrorMsg(error.getUserFriendlyMessage());
-                if (error.getErrorCategory() != null){
+                if (error.getErrorCategory() != null) {
                     errorResource.setErrorCategory(error.getErrorCategory().toString());
                 }
                 errorResource.setTransientPersistent(error.isTransientOrPersistent());
-                if (error.getCorrectiveAction() != null){
+                if (error.getCorrectiveAction() != null) {
                     errorResource.setCorrectiveAction(error.getCorrectiveAction().toString());
-                }else {
+                } else {
                     errorResource.setCorrectiveAction(CorrectiveAction.CONTACT_SUPPORT.toString());
                 }
-                if (error.getActionableGroup() != null){
+                if (error.getActionableGroup() != null) {
                     errorResource.setActionableGroup(error.getActionableGroup().toString());
-                }else {
+                } else {
                     errorResource.setActionableGroup(ActionableGroup.GATEWAYS_ADMINS.toString());
                 }
                 errorResource.save();
@@ -1625,7 +1573,7 @@ public class ExperimentRegistry {
             existingExperiment.setWorkflowExecutionId(experiment.getWorkflowExecutionInstanceId());
             existingExperiment.save();
             List<InputDataObjectType> experimentInputs = experiment.getExperimentInputs();
-            if (experimentInputs != null && !experimentInputs.isEmpty()){
+            if (experimentInputs != null && !experimentInputs.isEmpty()) {
                 updateExpInputs(experimentInputs, existingExperiment);
             }
 
@@ -1635,22 +1583,22 @@ public class ExperimentRegistry {
             }
 
             List<OutputDataObjectType> experimentOutputs = experiment.getExperimentOutputs();
-            if (experimentOutputs != null && !experimentOutputs.isEmpty()){
+            if (experimentOutputs != null && !experimentOutputs.isEmpty()) {
                 updateExpOutputs(experimentOutputs, expId);
             }
             ExperimentStatus experimentStatus = experiment.getExperimentStatus();
-            if (experimentStatus != null){
+            if (experimentStatus != null) {
                 updateExperimentStatus(experimentStatus, expId);
             }
             List<WorkflowNodeDetails> workflowNodeDetailsList = experiment.getWorkflowNodeDetailsList();
-            if (workflowNodeDetailsList != null && !workflowNodeDetailsList.isEmpty()){
-                for (WorkflowNodeDetails wf : workflowNodeDetailsList){
+            if (workflowNodeDetailsList != null && !workflowNodeDetailsList.isEmpty()) {
+                for (WorkflowNodeDetails wf : workflowNodeDetailsList) {
                     updateWorkflowNodeDetails(wf, wf.getNodeInstanceId());
                 }
             }
             List<ErrorDetails> errors = experiment.getErrors();
-            if (errors != null && !errors.isEmpty()){
-                for (ErrorDetails errror : errors){
+            if (errors != null && !errors.isEmpty()) {
+                for (ErrorDetails errror : errors) {
                     addErrorDetails(errror, expId);
                 }
             }
@@ -1794,8 +1742,8 @@ public class ExperimentRegistry {
         List<Experiment> experiments = new ArrayList<Experiment>();
         try {
             if (fieldName.equals(Constants.FieldConstants.ExperimentConstants.USER_NAME)) {
-                WorkerResource resource = (WorkerResource)gatewayResource.create(ResourceType.GATEWAY_WORKER);
-                resource.setUser((String)value);
+                WorkerResource resource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
+                resource.setUser((String) value);
                 List<ExperimentResource> resources = resource.getExperiments();
 //                List<ExperimentResource> resources = resource.getExperimentsByCaching((String)value);
                 for (ExperimentResource experimentResource : resources) {
@@ -1818,20 +1766,21 @@ public class ExperimentRegistry {
                     experiments.add(experiment);
                 }
                 return experiments;
-            } if (fieldName.equals(Constants.FieldConstants.ExperimentConstants.WORKFLOW_NODE_LIST)) {
-            	if (value instanceof List<?>){
-            		return getExperimentList(fieldName,((List<?>) value).get(0));
-            	}else if (value instanceof WorkflowNodeDetails){
-            		WorkflowNodeDetailResource nodeDetailResource = getWorkflowNodeDetailResource(((WorkflowNodeDetails) value).getNodeInstanceId());
-					if (nodeDetailResource!=null) {
-						return Arrays.asList(new Experiment[] { ThriftDataModelConversion
-										.getExperiment(nodeDetailResource
-												.getExperimentResource()) });
-					}
-            	}else{
-            		logger.error("Unsupported field value to retrieve workflow node detail list...");	
-            	}
- 
+            }
+            if (fieldName.equals(Constants.FieldConstants.ExperimentConstants.WORKFLOW_NODE_LIST)) {
+                if (value instanceof List<?>) {
+                    return getExperimentList(fieldName, ((List<?>) value).get(0));
+                } else if (value instanceof WorkflowNodeDetails) {
+                    WorkflowNodeDetailResource nodeDetailResource = getWorkflowNodeDetailResource(((WorkflowNodeDetails) value).getNodeInstanceId());
+                    if (nodeDetailResource != null) {
+                        return Arrays.asList(new Experiment[]{ThriftDataModelConversion
+                                .getExperiment(nodeDetailResource
+                                        .getExperimentResource())});
+                    }
+                } else {
+                    logger.error("Unsupported field value to retrieve workflow node detail list...");
+                }
+
             } else {
                 logger.error("Unsupported field name to retrieve experiment list...");
             }
@@ -1847,21 +1796,22 @@ public class ExperimentRegistry {
             if (fieldName.equals(Constants.FieldConstants.WorkflowNodeConstants.EXPERIMENT_ID)) {
                 ExperimentResource experiment = gatewayResource.getExperiment((String) value);
                 List<WorkflowNodeDetailResource> workflowNodeDetails = experiment.getWorkflowNodeDetails();
-                
+
                 return ThriftDataModelConversion.getWfNodeList(workflowNodeDetails);
-            } if (fieldName.equals(Constants.FieldConstants.WorkflowNodeConstants.TASK_LIST)) {
-            	if (value instanceof List<?>){
-            		return getWFNodeDetails(fieldName,((List<?>) value).get(0));
-            	}else if (value instanceof TaskDetails){
-            		TaskDetailResource taskDetailResource = getTaskDetailResource(((TaskDetails) value).getTaskID());
-					if (taskDetailResource!=null) {
-						return Arrays.asList(new WorkflowNodeDetails[] { ThriftDataModelConversion
-										.getWorkflowNodeDetails(taskDetailResource
-												.getWorkflowNodeDetailResource()) });
-					}
-            	}else{
-            		logger.error("Unsupported field value to retrieve workflow node detail list...");	
-            	}
+            }
+            if (fieldName.equals(Constants.FieldConstants.WorkflowNodeConstants.TASK_LIST)) {
+                if (value instanceof List<?>) {
+                    return getWFNodeDetails(fieldName, ((List<?>) value).get(0));
+                } else if (value instanceof TaskDetails) {
+                    TaskDetailResource taskDetailResource = getTaskDetailResource(((TaskDetails) value).getTaskID());
+                    if (taskDetailResource != null) {
+                        return Arrays.asList(new WorkflowNodeDetails[]{ThriftDataModelConversion
+                                .getWorkflowNodeDetails(taskDetailResource
+                                        .getWorkflowNodeDetailResource())});
+                    }
+                } else {
+                    logger.error("Unsupported field value to retrieve workflow node detail list...");
+                }
             } else {
                 logger.error("Unsupported field name to retrieve workflow detail list...");
             }
@@ -2178,7 +2128,7 @@ public class ExperimentRegistry {
             throw new RegistryException(e);
         }
     }
-    
+
     public WorkflowNodeDetails getWorkflowNodeDetails(String nodeId) throws RegistryException {
         try {
             ExperimentResource resource = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
@@ -2234,7 +2184,7 @@ public class ExperimentRegistry {
             throw new RegistryException(e);
         }
     }
-    
+
     public List<OutputDataObjectType> getApplicationOutputs(String taskId) throws RegistryException {
         try {
             ExperimentResource resource = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
@@ -2765,46 +2715,46 @@ public class ExperimentRegistry {
         }
     }
 
-    public List<ExperimentSummary> searchExperiments (Map<String, String> filters) throws RegistryException{
+    public List<ExperimentSummary> searchExperiments(Map<String, String> filters) throws RegistryException {
         Map<String, String> fil = new HashMap<String, String>();
-        if (filters != null && filters.size() != 0){
+        if (filters != null && filters.size() != 0) {
             List<ExperimentSummary> experimentSummaries = new ArrayList<ExperimentSummary>();
             long fromTime = 0;
             long toTime = 0;
             try {
-                for (String field : filters.keySet()){
-                    if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME)){
+                for (String field : filters.keySet()) {
+                    if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME)) {
                         fil.put(AbstractResource.ExperimentConstants.EXPERIMENT_NAME, filters.get(field));
-                    }else if (field.equals(Constants.FieldConstants.ExperimentConstants.USER_NAME)){
+                    } else if (field.equals(Constants.FieldConstants.ExperimentConstants.USER_NAME)) {
                         fil.put(AbstractResource.ExperimentConstants.EXECUTION_USER, filters.get(field));
-                    }else if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_DESC)){
+                    } else if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_DESC)) {
                         fil.put(AbstractResource.ExperimentConstants.DESCRIPTION, filters.get(field));
-                    }else if (field.equals(Constants.FieldConstants.ExperimentConstants.APPLICATION_ID)){
+                    } else if (field.equals(Constants.FieldConstants.ExperimentConstants.APPLICATION_ID)) {
                         fil.put(AbstractResource.ExperimentConstants.APPLICATION_ID, filters.get(field));
-                    }else if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS)){
+                    } else if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS)) {
                         return searchExperimentsByStatus(ExperimentState.valueOf(filters.get(field)));
-                    }else if (field.equals(Constants.FieldConstants.ExperimentConstants.FROM_DATE)){
+                    } else if (field.equals(Constants.FieldConstants.ExperimentConstants.FROM_DATE)) {
                         fromTime = Long.parseLong(filters.get(field));
-                    }else if (field.equals(Constants.FieldConstants.ExperimentConstants.TO_DATE)){
+                    } else if (field.equals(Constants.FieldConstants.ExperimentConstants.TO_DATE)) {
                         toTime = Long.parseLong(filters.get(field));
                     }
                 }
-                if (fromTime != 0 && toTime != 0){
+                if (fromTime != 0 && toTime != 0) {
                     return searchExperimentsByCreationTime(new Timestamp(fromTime), new Timestamp(toTime));
                 }
-                if (fil.containsKey(AbstractResource.ExperimentConstants.APPLICATION_ID)){
+                if (fil.containsKey(AbstractResource.ExperimentConstants.APPLICATION_ID)) {
                     return searchExperimentsByApplication(fil);
-                }else {
+                } else {
                     List<ExperimentResource> experimentResources = workerResource.searchExperiments(fil);
-                    if (experimentResources != null && !experimentResources.isEmpty()){
-                        for (ExperimentResource ex : experimentResources){
+                    if (experimentResources != null && !experimentResources.isEmpty()) {
+                        for (ExperimentResource ex : experimentResources) {
                             experimentSummaries.add(ThriftDataModelConversion.getExperimentSummary(ex));
                         }
                     }
                 }
                 return experimentSummaries;
 
-            }catch (Exception e){
+            } catch (Exception e) {
                 logger.error("Error while retrieving experiment summary from registry", e);
                 throw new RegistryException(e);
             }
@@ -2812,7 +2762,7 @@ public class ExperimentRegistry {
         return null;
     }
 
-    public List<ExperimentSummary> searchExperimentsByStatus (ExperimentState experimentState) throws RegistryException {
+    public List<ExperimentSummary> searchExperimentsByStatus(ExperimentState experimentState) throws RegistryException {
         try {
             List<ExperimentSummary> experimentSummaries = new ArrayList<ExperimentSummary>();
             List<ExperimentResource> experimentResources = workerResource.searchExperimentsByState(experimentState.toString());
@@ -2829,7 +2779,7 @@ public class ExperimentRegistry {
         }
     }
 
-    public List<ExperimentSummary> searchExperimentsByApplication (Map<String, String> fil) throws RegistryException {
+    public List<ExperimentSummary> searchExperimentsByApplication(Map<String, String> fil) throws RegistryException {
         try {
             List<ExperimentSummary> experimentSummaries = new ArrayList<ExperimentSummary>();
             List<ExperimentResource> experimentResources = workerResource.searchExperiments(fil);
@@ -2837,17 +2787,17 @@ public class ExperimentRegistry {
                 for (ExperimentResource ex : experimentResources) {
                     String applicationId = ex.getApplicationId();
                     String[] splits = applicationId.split("_");
-                    if (splits.length != 0){
-                       for (int i = 0; i< splits.length -1; i++){
-                           String appId = fil.get(AbstractResource.ExperimentConstants.APPLICATION_ID);
-                           if (!appId.equals("*")){
-                               if (splits[i].contains(appId)){
-                                   experimentSummaries.add(ThriftDataModelConversion.getExperimentSummary(ex));
-                               }
-                           }else {
-                               experimentSummaries.add(ThriftDataModelConversion.getExperimentSummary(ex));
-                           }
-                       }
+                    if (splits.length != 0) {
+                        for (int i = 0; i < splits.length - 1; i++) {
+                            String appId = fil.get(AbstractResource.ExperimentConstants.APPLICATION_ID);
+                            if (!appId.equals("*")) {
+                                if (splits[i].contains(appId)) {
+                                    experimentSummaries.add(ThriftDataModelConversion.getExperimentSummary(ex));
+                                }
+                            } else {
+                                experimentSummaries.add(ThriftDataModelConversion.getExperimentSummary(ex));
+                            }
+                        }
                     }
                 }
             }
@@ -2859,7 +2809,7 @@ public class ExperimentRegistry {
         }
     }
 
-    public List<ExperimentSummary> searchExperimentsByCreationTime (Timestamp fromTime, Timestamp toTime) throws RegistryException {
+    public List<ExperimentSummary> searchExperimentsByCreationTime(Timestamp fromTime, Timestamp toTime) throws RegistryException {
         try {
             List<ExperimentSummary> experimentSummaries = new ArrayList<ExperimentSummary>();
             List<ExperimentResource> experimentResources = workerResource.searchExperimentsByCreationTime(fromTime, toTime);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
index 2e68768..66a9796 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
@@ -56,10 +56,10 @@ public class ApplicationInput implements Serializable {
     @Column(name = "USER_FRIENDLY_DESC")
     private String userFriendlyDesc;
 
-    @Column(name="VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name="IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_STAGED")
     private boolean dataStaged;
 
@@ -147,20 +147,20 @@ public class ApplicationInput implements Serializable {
         this.userFriendlyDesc = userFriendlyDesc;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
index b865eb3..bab0d69 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
@@ -43,10 +43,10 @@ public class ApplicationOutput implements Serializable {
     @Column(name = "VALUE")
     private char[] value;
 
-    @Column(name = "VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name = "IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean addedToCmd;
     @Column(name = "DATA_MOVEMENT")
     private boolean dataMovement;
     @Column(name = "DATA_NAME_LOCATION")
@@ -56,14 +56,6 @@ public class ApplicationOutput implements Serializable {
     @JoinColumn(name = "TASK_ID")
     private TaskDetail task;
 
-    public String getCommandLineType() {
-        return commandLineType;
-    }
-
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
-    }
-
     public String getTaskId() {
         return taskId;
     }
@@ -104,12 +96,20 @@ public class ApplicationOutput implements Serializable {
         this.dataType = dataType;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
+    }
+
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
+    }
+
+    public boolean isAddedToCmd() {
+        return addedToCmd;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setAddedToCmd(boolean addedToCmd) {
+        this.addedToCmd = addedToCmd;
     }
 
     public boolean isDataMovement() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
index c174bce..e8c5087 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
@@ -61,10 +61,10 @@ public class Experiment_Input implements Serializable {
     @Column(name = "INPUT_ORDER")
     private int inputOrder;
 
-    @Column(name="VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name="IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_STAGED")
     private boolean dataStaged;
 
@@ -152,20 +152,20 @@ public class Experiment_Input implements Serializable {
         this.userFriendlyDesc = userFriendlyDesc;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
index fdb6469..62e19a5 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
@@ -44,10 +44,10 @@ public class Experiment_Output  implements Serializable {
     @Column(name = "DATA_TYPE")
     private String dataType;
 
-    @Column(name = "VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name = "IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_MOVEMENT")
     private boolean dataMovement;
     @Column(name = "DATA_NAME_LOCATION")
@@ -57,13 +57,6 @@ public class Experiment_Output  implements Serializable {
     @JoinColumn(name = "EXPERIMENT_ID")
     private Experiment experiment;
 
-    public String getCommandLineType() {
-        return commandLineType;
-    }
-
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
-    }
     public String getExperiment_id() {
         return experiment_id;
     }
@@ -104,12 +97,20 @@ public class Experiment_Output  implements Serializable {
         this.experiment = experiment;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
+    }
+
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
+    }
+
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataMovement() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
index 6d090e8..7e48cbf 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
@@ -54,10 +54,10 @@ public class NodeInput implements Serializable {
     @Column(name = "USER_FRIENDLY_DESC")
     private String userFriendlyDesc;
 
-    @Column(name="VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name="IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_STAGED")
     private boolean dataStaged;
 
@@ -145,20 +145,20 @@ public class NodeInput implements Serializable {
         this.inputOrder = inputOrder;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getIsRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setIsRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
index 7ec37c4..578a5fa 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
@@ -41,10 +41,10 @@ public class NodeOutput implements Serializable {
     private String dataType;
     @Column(name = "VALUE")
     private String value;
-    @Column(name = "VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name = "IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_MOVEMENT")
     private boolean dataMovement;
     @Column(name = "DATA_NAME_LOCATION")
@@ -55,14 +55,6 @@ public class NodeOutput implements Serializable {
     @JoinColumn(name = "NODE_INSTANCE_ID")
     private WorkflowNodeDetail node;
 
-    public String getCommandLineType() {
-        return commandLineType;
-    }
-
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
-    }
-
     public String getNodeId() {
         return nodeId;
     }
@@ -103,12 +95,20 @@ public class NodeOutput implements Serializable {
         this.dataType = dataType;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
+    }
+
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
+    }
+
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataMovement() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
index 8ce8c6d..d04fc85 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
@@ -46,24 +46,24 @@ public class ApplicationInputResource extends AbstractResource {
     private boolean standardInput;
     private String userFriendlyDesc;
     private int inputOrder;
-    private String validityType;
-    private String commandLineType;
+    private boolean isRequired;
+    private boolean requiredToCMD;
     private boolean dataStaged;
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {
@@ -190,8 +190,8 @@ public class ApplicationInputResource extends AbstractResource {
             applicationInput.setStandardInput(standardInput);
             applicationInput.setUserFriendlyDesc(userFriendlyDesc);
             applicationInput.setInputOrder(inputOrder);
-            applicationInput.setCommandLineType(commandLineType);
-            applicationInput.setValidityType(validityType);
+            applicationInput.setRequiredToCMD(requiredToCMD);
+            applicationInput.setRequired(isRequired);
             applicationInput.setDataStaged(dataStaged);
             if (value != null){
                 applicationInput.setValue(value.toCharArray());
@@ -208,8 +208,8 @@ public class ApplicationInputResource extends AbstractResource {
                 existingInput.setStandardInput(standardInput);
                 existingInput.setUserFriendlyDesc(userFriendlyDesc);
                 existingInput.setInputOrder(inputOrder);
-                existingInput.setCommandLineType(commandLineType);
-                existingInput.setValidityType(validityType);
+                existingInput.setRequiredToCMD(requiredToCMD);
+                existingInput.setRequired(isRequired);
                 existingInput.setDataStaged(dataStaged);
                 if (value != null){
                     existingInput.setValue(value.toCharArray());

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
index a497b40..d5441f3 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
@@ -41,25 +41,25 @@ public class ApplicationOutputResource extends AbstractResource {
     private String outputKey;
     private String dataType;
     private String value;
-    private String validityType;
+    private boolean isRequired;
     private boolean dataMovement;
     private String dataNameLocation;
-    private String commandLineType;
+    private boolean requiredToCMD;
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean isRequired() {
+        return isRequired;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataMovement() {
@@ -150,8 +150,8 @@ public class ApplicationOutputResource extends AbstractResource {
             applicationOutput.setTaskId(taskDetail.getTaskId());
             applicationOutput.setOutputKey(outputKey);
             applicationOutput.setDataType(dataType);
-            applicationOutput.setValidityType(validityType);
-            applicationOutput.setCommandLineType(commandLineType);
+            applicationOutput.setRequired(isRequired);
+            applicationOutput.setAddedToCmd(requiredToCMD);
             applicationOutput.setDataMovement(dataMovement);
             applicationOutput.setDataNameLocation(dataNameLocation);
             if (value != null){
@@ -163,8 +163,8 @@ public class ApplicationOutputResource extends AbstractResource {
                 existingOutput.setTaskId(taskDetail.getTaskId());
                 existingOutput.setOutputKey(outputKey);
                 existingOutput.setDataType(dataType);
-                existingOutput.setValidityType(validityType);
-                existingOutput.setCommandLineType(commandLineType);
+                existingOutput.setRequired(isRequired);
+                existingOutput.setAddedToCmd(requiredToCMD);
                 existingOutput.setDataMovement(dataMovement);
                 existingOutput.setDataNameLocation(dataNameLocation);
                 if (value != null){

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
index eaf401d..1466522 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
@@ -46,24 +46,24 @@ public class ExperimentInputResource extends AbstractResource {
     private boolean standardInput;
     private String userFriendlyDesc;
     private int inputOrder;
-    private String validityType;
-    private String commandLineType;
+    private boolean isRequired;
+    private boolean requiredToCMD;
     private boolean dataStaged;
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {
@@ -189,8 +189,8 @@ public class ExperimentInputResource extends AbstractResource {
             exInput.setStandardInput(standardInput);
             exInput.setUserFriendlyDesc(userFriendlyDesc);
             exInput.setInputOrder(inputOrder);
-            exInput.setCommandLineType(commandLineType);
-            exInput.setValidityType(validityType);
+            exInput.setRequiredToCMD(requiredToCMD);
+            exInput.setRequired(isRequired);
             exInput.setDataStaged(dataStaged);
             if (existingInput != null) {
                 existingInput.setEx_key(experimentKey);
@@ -205,8 +205,8 @@ public class ExperimentInputResource extends AbstractResource {
                 existingInput.setStandardInput(standardInput);
                 existingInput.setUserFriendlyDesc(userFriendlyDesc);
                 existingInput.setInputOrder(inputOrder);
-                existingInput.setCommandLineType(commandLineType);
-                existingInput.setValidityType(validityType);
+                existingInput.setRequiredToCMD(requiredToCMD);
+                existingInput.setRequired(isRequired);
                 existingInput.setDataStaged(dataStaged);
                 exInput = em.merge(existingInput);
             } else {


[4/4] airavata git commit: changing validity type and addedToCMD to boolean

Posted by ch...@apache.org.
changing validity type and addedToCMD to boolean


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f8b6adb7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f8b6adb7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f8b6adb7

Branch: refs/heads/master
Commit: f8b6adb7b4d0dc03ba0c9dc817092c46dc9b6545
Parents: 97ad96b
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Jan 12 16:40:08 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Jan 12 16:40:08 2015 -0500

----------------------------------------------------------------------
 .../applicationInterfaceModel_types.cpp         | 162 +++----
 .../airavata/applicationInterfaceModel_types.h  |  94 ++--
 .../lib/airavata/experimentModel_types.cpp      |  12 +-
 .../lib/airavata/experimentModel_types.h        |  12 +-
 .../lib/airavata/messagingEvents_types.cpp      |   4 +-
 .../lib/airavata/messagingEvents_types.h        |   4 +-
 .../lib/airavata/workflowDataModel_types.cpp    |   4 +-
 .../lib/airavata/workflowDataModel_types.h      |   4 +-
 .../Model/AppCatalog/AppInterface/Types.php     |  98 ++--
 .../client/samples/RegisterSampleData.java      |  44 +-
 .../tools/RegisterOGCEUS3Application.java       |   4 +-
 .../tools/RegisterSampleApplications.java       | 124 ++---
 .../tools/RegisterSampleApplicationsUtils.java  |  24 +-
 .../client/tools/RegisterUS3Application.java    |   4 +-
 .../appinterface/CommandLineType.java           |  62 ---
 .../appinterface/InputDataObjectType.java       | 258 +++++-----
 .../appinterface/OutputDataObjectType.java      | 258 +++++-----
 .../appcatalog/appinterface/ValidityType.java   |  62 ---
 .../applicationInterfaceModel.thrift            |  18 +-
 .../data/impl/ApplicationInterfaceImpl.java     |  36 +-
 .../catalog/data/model/ApplicationInput.java    |  24 +-
 .../catalog/data/model/ApplicationOutput.java   |  31 +-
 .../catalog/data/model/WorkflowInput.java       |  24 +-
 .../resources/ApplicationInputResource.java     |  24 +-
 .../resources/ApplicationOutputResource.java    |  24 +-
 .../data/resources/WorkflowInputResource.java   |  24 +-
 .../catalog/data/util/AppCatalogJPAUtils.java   |  12 +-
 .../data/util/AppCatalogThriftConversion.java   |  26 +-
 .../src/main/resources/appcatalog-derby.sql     |   8 +-
 .../src/main/resources/appcatalog-mysql.sql     |   8 +-
 .../src/test/resources/appcatalog-derby.sql     |   8 +-
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |   2 +-
 .../gfac/gsissh/util/GFACGSISSHUtils.java       |   7 +-
 .../ssh/handler/AdvancedSCPOutputHandler.java   |  11 +-
 .../airavata/gfac/ssh/util/GFACSSHUtils.java    |   7 +-
 .../registry/jpa/impl/ExperimentRegistry.java   | 466 +++++++++----------
 .../registry/jpa/model/ApplicationInput.java    |  24 +-
 .../registry/jpa/model/ApplicationOutput.java   |  32 +-
 .../registry/jpa/model/Experiment_Input.java    |  24 +-
 .../registry/jpa/model/Experiment_Output.java   |  31 +-
 .../registry/jpa/model/NodeInput.java           |  24 +-
 .../registry/jpa/model/NodeOutput.java          |  32 +-
 .../jpa/resources/ApplicationInputResource.java |  28 +-
 .../resources/ApplicationOutputResource.java    |  28 +-
 .../jpa/resources/ExperimentInputResource.java  |  28 +-
 .../jpa/resources/ExperimentOutputResource.java |  28 +-
 .../jpa/resources/NodeInputResource.java        |  28 +-
 .../jpa/resources/NodeOutputResource.java       |  28 +-
 .../registry/jpa/resources/Utils.java           |  24 +-
 .../jpa/utils/ThriftDataModelConversion.java    |  48 +-
 .../src/main/resources/registry-derby.sql       |  26 +-
 .../src/main/resources/registry-mysql.sql       |  26 +-
 .../src/test/resources/registry-derby.sql       |  23 +-
 53 files changed, 1042 insertions(+), 1434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
index 49a9a2e..0b7adf7 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
@@ -45,28 +45,8 @@ const char* _kDataTypeNames[] = {
 };
 const std::map<int, const char*> _DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kDataTypeValues, _kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
-int _kValidityTypeValues[] = {
-  ValidityType::REQUIRED,
-  ValidityType::OPTIONAL
-};
-const char* _kValidityTypeNames[] = {
-  "REQUIRED",
-  "OPTIONAL"
-};
-const std::map<int, const char*> _ValidityType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kValidityTypeValues, _kValidityTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-int _kCommandLineTypeValues[] = {
-  CommandLineType::IMPLICIT,
-  CommandLineType::EXPLICIT
-};
-const char* _kCommandLineTypeNames[] = {
-  "IMPLICIT",
-  "EXPLICIT"
-};
-const std::map<int, const char*> _CommandLineType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kCommandLineTypeValues, _kCommandLineTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-const char* InputDataObjectType::ascii_fingerprint = "95DCCA621F7BE3FA34349CC6A45329DA";
-const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x95,0xDC,0xCA,0x62,0x1F,0x7B,0xE3,0xFA,0x34,0x34,0x9C,0xC6,0xA4,0x53,0x29,0xDA};
+const char* InputDataObjectType::ascii_fingerprint = "22DB8CAA7C1FBBFDD0CA6E19790BA799";
+const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x22,0xDB,0x8C,0xAA,0x7C,0x1F,0xBB,0xFD,0xD0,0xCA,0x6E,0x19,0x79,0x0B,0xA7,0x99};
 
 uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -156,21 +136,17 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
         }
         break;
       case 9:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1;
-          xfer += iprot->readI32(ecast1);
-          this->inputValid = (ValidityType::type)ecast1;
-          this->__isset.inputValid = true;
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->isRequired);
+          this->__isset.isRequired = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 10:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast2;
-          xfer += iprot->readI32(ecast2);
-          this->addedToCommandLine = (CommandLineType::type)ecast2;
-          this->__isset.addedToCommandLine = true;
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->requiredToAddedToCommandLine);
+          this->__isset.requiredToAddedToCommandLine = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -240,14 +216,14 @@ uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* oprot
     xfer += oprot->writeI32(this->inputOrder);
     xfer += oprot->writeFieldEnd();
   }
-  if (this->__isset.inputValid) {
-    xfer += oprot->writeFieldBegin("inputValid", ::apache::thrift::protocol::T_I32, 9);
-    xfer += oprot->writeI32((int32_t)this->inputValid);
+  if (this->__isset.isRequired) {
+    xfer += oprot->writeFieldBegin("isRequired", ::apache::thrift::protocol::T_BOOL, 9);
+    xfer += oprot->writeBool(this->isRequired);
     xfer += oprot->writeFieldEnd();
   }
-  if (this->__isset.addedToCommandLine) {
-    xfer += oprot->writeFieldBegin("addedToCommandLine", ::apache::thrift::protocol::T_I32, 10);
-    xfer += oprot->writeI32((int32_t)this->addedToCommandLine);
+  if (this->__isset.requiredToAddedToCommandLine) {
+    xfer += oprot->writeFieldBegin("requiredToAddedToCommandLine", ::apache::thrift::protocol::T_BOOL, 10);
+    xfer += oprot->writeBool(this->requiredToAddedToCommandLine);
     xfer += oprot->writeFieldEnd();
   }
   if (this->__isset.dataStaged) {
@@ -270,14 +246,14 @@ void swap(InputDataObjectType &a, InputDataObjectType &b) {
   swap(a.userFriendlyDescription, b.userFriendlyDescription);
   swap(a.metaData, b.metaData);
   swap(a.inputOrder, b.inputOrder);
-  swap(a.inputValid, b.inputValid);
-  swap(a.addedToCommandLine, b.addedToCommandLine);
+  swap(a.isRequired, b.isRequired);
+  swap(a.requiredToAddedToCommandLine, b.requiredToAddedToCommandLine);
   swap(a.dataStaged, b.dataStaged);
   swap(a.__isset, b.__isset);
 }
 
-const char* OutputDataObjectType::ascii_fingerprint = "C7730F2BFEF5236FD42B9C23095938DB";
-const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0xC7,0x73,0x0F,0x2B,0xFE,0xF5,0x23,0x6F,0xD4,0x2B,0x9C,0x23,0x09,0x59,0x38,0xDB};
+const char* OutputDataObjectType::ascii_fingerprint = "E4852521B22B693B0FFBEBAE57AA4F8A";
+const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0xE4,0x85,0x25,0x21,0xB2,0x2B,0x69,0x3B,0x0F,0xFB,0xEB,0xAE,0x57,0xAA,0x4F,0x8A};
 
 uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -318,30 +294,26 @@ uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot
         break;
       case 3:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast3;
-          xfer += iprot->readI32(ecast3);
-          this->type = (DataType::type)ecast3;
+          int32_t ecast1;
+          xfer += iprot->readI32(ecast1);
+          this->type = (DataType::type)ecast1;
           this->__isset.type = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 4:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast4;
-          xfer += iprot->readI32(ecast4);
-          this->validityType = (ValidityType::type)ecast4;
-          this->__isset.validityType = true;
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->isRequired);
+          this->__isset.isRequired = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 5:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast5;
-          xfer += iprot->readI32(ecast5);
-          this->addedToCommandLine = (CommandLineType::type)ecast5;
-          this->__isset.addedToCommandLine = true;
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->requiredToAddedToCommandLine);
+          this->__isset.requiredToAddedToCommandLine = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -394,14 +366,14 @@ uint32_t OutputDataObjectType::write(::apache::thrift::protocol::TProtocol* opro
     xfer += oprot->writeI32((int32_t)this->type);
     xfer += oprot->writeFieldEnd();
   }
-  if (this->__isset.validityType) {
-    xfer += oprot->writeFieldBegin("validityType", ::apache::thrift::protocol::T_I32, 4);
-    xfer += oprot->writeI32((int32_t)this->validityType);
+  if (this->__isset.isRequired) {
+    xfer += oprot->writeFieldBegin("isRequired", ::apache::thrift::protocol::T_BOOL, 4);
+    xfer += oprot->writeBool(this->isRequired);
     xfer += oprot->writeFieldEnd();
   }
-  if (this->__isset.addedToCommandLine) {
-    xfer += oprot->writeFieldBegin("addedToCommandLine", ::apache::thrift::protocol::T_I32, 5);
-    xfer += oprot->writeI32((int32_t)this->addedToCommandLine);
+  if (this->__isset.requiredToAddedToCommandLine) {
+    xfer += oprot->writeFieldBegin("requiredToAddedToCommandLine", ::apache::thrift::protocol::T_BOOL, 5);
+    xfer += oprot->writeBool(this->requiredToAddedToCommandLine);
     xfer += oprot->writeFieldEnd();
   }
   if (this->__isset.dataMovement) {
@@ -424,15 +396,15 @@ void swap(OutputDataObjectType &a, OutputDataObjectType &b) {
   swap(a.name, b.name);
   swap(a.value, b.value);
   swap(a.type, b.type);
-  swap(a.validityType, b.validityType);
-  swap(a.addedToCommandLine, b.addedToCommandLine);
+  swap(a.isRequired, b.isRequired);
+  swap(a.requiredToAddedToCommandLine, b.requiredToAddedToCommandLine);
   swap(a.dataMovement, b.dataMovement);
   swap(a.dataNameLocation, b.dataNameLocation);
   swap(a.__isset, b.__isset);
 }
 
-const char* ApplicationInterfaceDescription::ascii_fingerprint = "3BB1C87ED8E5FD354E5AE0409D72BE54";
-const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0x3B,0xB1,0xC8,0x7E,0xD8,0xE5,0xFD,0x35,0x4E,0x5A,0xE0,0x40,0x9D,0x72,0xBE,0x54};
+const char* ApplicationInterfaceDescription::ascii_fingerprint = "29D39A862EDAA850C0484542CD39F4A3";
+const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0x29,0xD3,0x9A,0x86,0x2E,0xDA,0xA8,0x50,0xC0,0x48,0x45,0x42,0xCD,0x39,0xF4,0xA3};
 
 uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -484,14 +456,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->applicationModules.clear();
-            uint32_t _size6;
-            ::apache::thrift::protocol::TType _etype9;
-            xfer += iprot->readListBegin(_etype9, _size6);
-            this->applicationModules.resize(_size6);
-            uint32_t _i10;
-            for (_i10 = 0; _i10 < _size6; ++_i10)
+            uint32_t _size2;
+            ::apache::thrift::protocol::TType _etype5;
+            xfer += iprot->readListBegin(_etype5, _size2);
+            this->applicationModules.resize(_size2);
+            uint32_t _i6;
+            for (_i6 = 0; _i6 < _size2; ++_i6)
             {
-              xfer += iprot->readString(this->applicationModules[_i10]);
+              xfer += iprot->readString(this->applicationModules[_i6]);
             }
             xfer += iprot->readListEnd();
           }
@@ -504,14 +476,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->applicationInputs.clear();
-            uint32_t _size11;
-            ::apache::thrift::protocol::TType _etype14;
-            xfer += iprot->readListBegin(_etype14, _size11);
-            this->applicationInputs.resize(_size11);
-            uint32_t _i15;
-            for (_i15 = 0; _i15 < _size11; ++_i15)
+            uint32_t _size7;
+            ::apache::thrift::protocol::TType _etype10;
+            xfer += iprot->readListBegin(_etype10, _size7);
+            this->applicationInputs.resize(_size7);
+            uint32_t _i11;
+            for (_i11 = 0; _i11 < _size7; ++_i11)
             {
-              xfer += this->applicationInputs[_i15].read(iprot);
+              xfer += this->applicationInputs[_i11].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -524,14 +496,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->applicationOutputs.clear();
-            uint32_t _size16;
-            ::apache::thrift::protocol::TType _etype19;
-            xfer += iprot->readListBegin(_etype19, _size16);
-            this->applicationOutputs.resize(_size16);
-            uint32_t _i20;
-            for (_i20 = 0; _i20 < _size16; ++_i20)
+            uint32_t _size12;
+            ::apache::thrift::protocol::TType _etype15;
+            xfer += iprot->readListBegin(_etype15, _size12);
+            this->applicationOutputs.resize(_size12);
+            uint32_t _i16;
+            for (_i16 = 0; _i16 < _size12; ++_i16)
             {
-              xfer += this->applicationOutputs[_i20].read(iprot);
+              xfer += this->applicationOutputs[_i16].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -577,10 +549,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
     xfer += oprot->writeFieldBegin("applicationModules", ::apache::thrift::protocol::T_LIST, 4);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->applicationModules.size()));
-      std::vector<std::string> ::const_iterator _iter21;
-      for (_iter21 = this->applicationModules.begin(); _iter21 != this->applicationModules.end(); ++_iter21)
+      std::vector<std::string> ::const_iterator _iter17;
+      for (_iter17 = this->applicationModules.begin(); _iter17 != this->applicationModules.end(); ++_iter17)
       {
-        xfer += oprot->writeString((*_iter21));
+        xfer += oprot->writeString((*_iter17));
       }
       xfer += oprot->writeListEnd();
     }
@@ -590,10 +562,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
     xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 5);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationInputs.size()));
-      std::vector<InputDataObjectType> ::const_iterator _iter22;
-      for (_iter22 = this->applicationInputs.begin(); _iter22 != this->applicationInputs.end(); ++_iter22)
+      std::vector<InputDataObjectType> ::const_iterator _iter18;
+      for (_iter18 = this->applicationInputs.begin(); _iter18 != this->applicationInputs.end(); ++_iter18)
       {
-        xfer += (*_iter22).write(oprot);
+        xfer += (*_iter18).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -603,10 +575,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
     xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 6);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationOutputs.size()));
-      std::vector<OutputDataObjectType> ::const_iterator _iter23;
-      for (_iter23 = this->applicationOutputs.begin(); _iter23 != this->applicationOutputs.end(); ++_iter23)
+      std::vector<OutputDataObjectType> ::const_iterator _iter19;
+      for (_iter19 = this->applicationOutputs.begin(); _iter19 != this->applicationOutputs.end(); ++_iter19)
       {
-        xfer += (*_iter23).write(oprot);
+        xfer += (*_iter19).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
index 39af4a9..53fd2af 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
@@ -47,26 +47,8 @@ struct DataType {
 
 extern const std::map<int, const char*> _DataType_VALUES_TO_NAMES;
 
-struct ValidityType {
-  enum type {
-    REQUIRED = 0,
-    OPTIONAL = 1
-  };
-};
-
-extern const std::map<int, const char*> _ValidityType_VALUES_TO_NAMES;
-
-struct CommandLineType {
-  enum type {
-    IMPLICIT = 0,
-    EXPLICIT = 1
-  };
-};
-
-extern const std::map<int, const char*> _CommandLineType_VALUES_TO_NAMES;
-
 typedef struct _InputDataObjectType__isset {
-  _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false), inputOrder(false), inputValid(false), addedToCommandLine(false), dataStaged(true) {}
+  _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false), inputOrder(false), isRequired(false), requiredToAddedToCommandLine(false), dataStaged(true) {}
   bool value;
   bool type;
   bool applicationArgument;
@@ -74,18 +56,18 @@ typedef struct _InputDataObjectType__isset {
   bool userFriendlyDescription;
   bool metaData;
   bool inputOrder;
-  bool inputValid;
-  bool addedToCommandLine;
+  bool isRequired;
+  bool requiredToAddedToCommandLine;
   bool dataStaged;
 } _InputDataObjectType__isset;
 
 class InputDataObjectType {
  public:
 
-  static const char* ascii_fingerprint; // = "95DCCA621F7BE3FA34349CC6A45329DA";
-  static const uint8_t binary_fingerprint[16]; // = {0x95,0xDC,0xCA,0x62,0x1F,0x7B,0xE3,0xFA,0x34,0x34,0x9C,0xC6,0xA4,0x53,0x29,0xDA};
+  static const char* ascii_fingerprint; // = "22DB8CAA7C1FBBFDD0CA6E19790BA799";
+  static const uint8_t binary_fingerprint[16]; // = {0x22,0xDB,0x8C,0xAA,0x7C,0x1F,0xBB,0xFD,0xD0,0xCA,0x6E,0x19,0x79,0x0B,0xA7,0x99};
 
-  InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData(), inputOrder(0), inputValid((ValidityType::type)0), addedToCommandLine((CommandLineType::type)0), dataStaged(false) {
+  InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData(), inputOrder(0), isRequired(0), requiredToAddedToCommandLine(0), dataStaged(false) {
   }
 
   virtual ~InputDataObjectType() throw() {}
@@ -98,8 +80,8 @@ class InputDataObjectType {
   std::string userFriendlyDescription;
   std::string metaData;
   int32_t inputOrder;
-  ValidityType::type inputValid;
-  CommandLineType::type addedToCommandLine;
+  bool isRequired;
+  bool requiredToAddedToCommandLine;
   bool dataStaged;
 
   _InputDataObjectType__isset __isset;
@@ -143,14 +125,14 @@ class InputDataObjectType {
     __isset.inputOrder = true;
   }
 
-  void __set_inputValid(const ValidityType::type val) {
-    inputValid = val;
-    __isset.inputValid = true;
+  void __set_isRequired(const bool val) {
+    isRequired = val;
+    __isset.isRequired = true;
   }
 
-  void __set_addedToCommandLine(const CommandLineType::type val) {
-    addedToCommandLine = val;
-    __isset.addedToCommandLine = true;
+  void __set_requiredToAddedToCommandLine(const bool val) {
+    requiredToAddedToCommandLine = val;
+    __isset.requiredToAddedToCommandLine = true;
   }
 
   void __set_dataStaged(const bool val) {
@@ -190,13 +172,13 @@ class InputDataObjectType {
       return false;
     else if (__isset.inputOrder && !(inputOrder == rhs.inputOrder))
       return false;
-    if (__isset.inputValid != rhs.__isset.inputValid)
+    if (__isset.isRequired != rhs.__isset.isRequired)
       return false;
-    else if (__isset.inputValid && !(inputValid == rhs.inputValid))
+    else if (__isset.isRequired && !(isRequired == rhs.isRequired))
       return false;
-    if (__isset.addedToCommandLine != rhs.__isset.addedToCommandLine)
+    if (__isset.requiredToAddedToCommandLine != rhs.__isset.requiredToAddedToCommandLine)
       return false;
-    else if (__isset.addedToCommandLine && !(addedToCommandLine == rhs.addedToCommandLine))
+    else if (__isset.requiredToAddedToCommandLine && !(requiredToAddedToCommandLine == rhs.requiredToAddedToCommandLine))
       return false;
     if (__isset.dataStaged != rhs.__isset.dataStaged)
       return false;
@@ -218,11 +200,11 @@ class InputDataObjectType {
 void swap(InputDataObjectType &a, InputDataObjectType &b);
 
 typedef struct _OutputDataObjectType__isset {
-  _OutputDataObjectType__isset() : value(false), type(false), validityType(false), addedToCommandLine(false), dataMovement(false), dataNameLocation(false) {}
+  _OutputDataObjectType__isset() : value(false), type(false), isRequired(false), requiredToAddedToCommandLine(false), dataMovement(false), dataNameLocation(false) {}
   bool value;
   bool type;
-  bool validityType;
-  bool addedToCommandLine;
+  bool isRequired;
+  bool requiredToAddedToCommandLine;
   bool dataMovement;
   bool dataNameLocation;
 } _OutputDataObjectType__isset;
@@ -230,10 +212,10 @@ typedef struct _OutputDataObjectType__isset {
 class OutputDataObjectType {
  public:
 
-  static const char* ascii_fingerprint; // = "C7730F2BFEF5236FD42B9C23095938DB";
-  static const uint8_t binary_fingerprint[16]; // = {0xC7,0x73,0x0F,0x2B,0xFE,0xF5,0x23,0x6F,0xD4,0x2B,0x9C,0x23,0x09,0x59,0x38,0xDB};
+  static const char* ascii_fingerprint; // = "E4852521B22B693B0FFBEBAE57AA4F8A";
+  static const uint8_t binary_fingerprint[16]; // = {0xE4,0x85,0x25,0x21,0xB2,0x2B,0x69,0x3B,0x0F,0xFB,0xEB,0xAE,0x57,0xAA,0x4F,0x8A};
 
-  OutputDataObjectType() : name(), value(), type((DataType::type)0), validityType((ValidityType::type)0), addedToCommandLine((CommandLineType::type)0), dataMovement(0), dataNameLocation() {
+  OutputDataObjectType() : name(), value(), type((DataType::type)0), isRequired(0), requiredToAddedToCommandLine(0), dataMovement(0), dataNameLocation() {
   }
 
   virtual ~OutputDataObjectType() throw() {}
@@ -241,8 +223,8 @@ class OutputDataObjectType {
   std::string name;
   std::string value;
   DataType::type type;
-  ValidityType::type validityType;
-  CommandLineType::type addedToCommandLine;
+  bool isRequired;
+  bool requiredToAddedToCommandLine;
   bool dataMovement;
   std::string dataNameLocation;
 
@@ -262,14 +244,14 @@ class OutputDataObjectType {
     __isset.type = true;
   }
 
-  void __set_validityType(const ValidityType::type val) {
-    validityType = val;
-    __isset.validityType = true;
+  void __set_isRequired(const bool val) {
+    isRequired = val;
+    __isset.isRequired = true;
   }
 
-  void __set_addedToCommandLine(const CommandLineType::type val) {
-    addedToCommandLine = val;
-    __isset.addedToCommandLine = true;
+  void __set_requiredToAddedToCommandLine(const bool val) {
+    requiredToAddedToCommandLine = val;
+    __isset.requiredToAddedToCommandLine = true;
   }
 
   void __set_dataMovement(const bool val) {
@@ -294,13 +276,13 @@ class OutputDataObjectType {
       return false;
     else if (__isset.type && !(type == rhs.type))
       return false;
-    if (__isset.validityType != rhs.__isset.validityType)
+    if (__isset.isRequired != rhs.__isset.isRequired)
       return false;
-    else if (__isset.validityType && !(validityType == rhs.validityType))
+    else if (__isset.isRequired && !(isRequired == rhs.isRequired))
       return false;
-    if (__isset.addedToCommandLine != rhs.__isset.addedToCommandLine)
+    if (__isset.requiredToAddedToCommandLine != rhs.__isset.requiredToAddedToCommandLine)
       return false;
-    else if (__isset.addedToCommandLine && !(addedToCommandLine == rhs.addedToCommandLine))
+    else if (__isset.requiredToAddedToCommandLine && !(requiredToAddedToCommandLine == rhs.requiredToAddedToCommandLine))
       return false;
     if (__isset.dataMovement != rhs.__isset.dataMovement)
       return false;
@@ -336,8 +318,8 @@ typedef struct _ApplicationInterfaceDescription__isset {
 class ApplicationInterfaceDescription {
  public:
 
-  static const char* ascii_fingerprint; // = "3BB1C87ED8E5FD354E5AE0409D72BE54";
-  static const uint8_t binary_fingerprint[16]; // = {0x3B,0xB1,0xC8,0x7E,0xD8,0xE5,0xFD,0x35,0x4E,0x5A,0xE0,0x40,0x9D,0x72,0xBE,0x54};
+  static const char* ascii_fingerprint; // = "29D39A862EDAA850C0484542CD39F4A3";
+  static const uint8_t binary_fingerprint[16]; // = {0x29,0xD3,0x9A,0x86,0x2E,0xDA,0xA8,0x50,0xC0,0x48,0x45,0x42,0xCD,0x39,0xF4,0xA3};
 
   ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription() {
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
index af464cd..1e9e667 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
@@ -1843,8 +1843,8 @@ void swap(DataTransferDetails &a, DataTransferDetails &b) {
   swap(a.__isset, b.__isset);
 }
 
-const char* TaskDetails::ascii_fingerprint = "929162F2CFE206BC896243F516266754";
-const uint8_t TaskDetails::binary_fingerprint[16] = {0x92,0x91,0x62,0xF2,0xCF,0xE2,0x06,0xBC,0x89,0x62,0x43,0xF5,0x16,0x26,0x67,0x54};
+const char* TaskDetails::ascii_fingerprint = "89E8B92F7318CCFA137F6774D833A5B2";
+const uint8_t TaskDetails::binary_fingerprint[16] = {0x89,0xE8,0xB9,0x2F,0x73,0x18,0xCC,0xFA,0x13,0x7F,0x67,0x74,0xD8,0x33,0xA5,0xB2};
 
 uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2190,8 +2190,8 @@ void swap(TaskDetails &a, TaskDetails &b) {
   swap(a.__isset, b.__isset);
 }
 
-const char* WorkflowNodeDetails::ascii_fingerprint = "770C73AD302F29182AA4C501D39E8ADF";
-const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x77,0x0C,0x73,0xAD,0x30,0x2F,0x29,0x18,0x2A,0xA4,0xC5,0x01,0xD3,0x9E,0x8A,0xDF};
+const char* WorkflowNodeDetails::ascii_fingerprint = "848AB686F7E85BB9EA788751E264556B";
+const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x84,0x8A,0xB6,0x86,0xF7,0xE8,0x5B,0xB9,0xEA,0x78,0x87,0x51,0xE2,0x64,0x55,0x6B};
 
 uint32_t WorkflowNodeDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -2646,8 +2646,8 @@ void swap(ValidationResults &a, ValidationResults &b) {
   swap(a.validationResultList, b.validationResultList);
 }
 
-const char* Experiment::ascii_fingerprint = "B144E8C411770A1464B18D645C8E31EA";
-const uint8_t Experiment::binary_fingerprint[16] = {0xB1,0x44,0xE8,0xC4,0x11,0x77,0x0A,0x14,0x64,0xB1,0x8D,0x64,0x5C,0x8E,0x31,0xEA};
+const char* Experiment::ascii_fingerprint = "38B6FB610EBD53743F28A960C25CCEC5";
+const uint8_t Experiment::binary_fingerprint[16] = {0x38,0xB6,0xFB,0x61,0x0E,0xBD,0x53,0x74,0x3F,0x28,0xA9,0x60,0xC2,0x5C,0xCE,0xC5};
 
 uint32_t Experiment::read(::apache::thrift::protocol::TProtocol* iprot) {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
index 8ae102b..2044f7a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
@@ -1294,8 +1294,8 @@ typedef struct _TaskDetails__isset {
 class TaskDetails {
  public:
 
-  static const char* ascii_fingerprint; // = "929162F2CFE206BC896243F516266754";
-  static const uint8_t binary_fingerprint[16]; // = {0x92,0x91,0x62,0xF2,0xCF,0xE2,0x06,0xBC,0x89,0x62,0x43,0xF5,0x16,0x26,0x67,0x54};
+  static const char* ascii_fingerprint; // = "89E8B92F7318CCFA137F6774D833A5B2";
+  static const uint8_t binary_fingerprint[16]; // = {0x89,0xE8,0xB9,0x2F,0x73,0x18,0xCC,0xFA,0x13,0x7F,0x67,0x74,0xD8,0x33,0xA5,0xB2};
 
   TaskDetails() : taskID("DO_NOT_SET_AT_CLIENTS"), creationTime(0), applicationId(), applicationVersion(), applicationDeploymentId() {
   }
@@ -1473,8 +1473,8 @@ typedef struct _WorkflowNodeDetails__isset {
 class WorkflowNodeDetails {
  public:
 
-  static const char* ascii_fingerprint; // = "770C73AD302F29182AA4C501D39E8ADF";
-  static const uint8_t binary_fingerprint[16]; // = {0x77,0x0C,0x73,0xAD,0x30,0x2F,0x29,0x18,0x2A,0xA4,0xC5,0x01,0xD3,0x9E,0x8A,0xDF};
+  static const char* ascii_fingerprint; // = "848AB686F7E85BB9EA788751E264556B";
+  static const uint8_t binary_fingerprint[16]; // = {0x84,0x8A,0xB6,0x86,0xF7,0xE8,0x5B,0xB9,0xEA,0x78,0x87,0x51,0xE2,0x64,0x55,0x6B};
 
   WorkflowNodeDetails() : nodeInstanceId("DO_NOT_SET_AT_CLIENTS"), creationTime(0), nodeName("SINGLE_APP_NODE"), executionUnit((ExecutionUnit::type)1), executionUnitData() {
     executionUnit = (ExecutionUnit::type)1;
@@ -1712,8 +1712,8 @@ typedef struct _Experiment__isset {
 class Experiment {
  public:
 
-  static const char* ascii_fingerprint; // = "B144E8C411770A1464B18D645C8E31EA";
-  static const uint8_t binary_fingerprint[16]; // = {0xB1,0x44,0xE8,0xC4,0x11,0x77,0x0A,0x14,0x64,0xB1,0x8D,0x64,0x5C,0x8E,0x31,0xEA};
+  static const char* ascii_fingerprint; // = "38B6FB610EBD53743F28A960C25CCEC5";
+  static const uint8_t binary_fingerprint[16]; // = {0x38,0xB6,0xFB,0x61,0x0E,0xBD,0x53,0x74,0x3F,0x28,0xA9,0x60,0xC2,0x5C,0xCE,0xC5};
 
   Experiment() : experimentID("DO_NOT_SET_AT_CLIENTS"), projectID("DEFAULT"), creationTime(0), userName(), name(), description(), applicationId(), applicationVersion(), workflowTemplateId(), workflowTemplateVersion(), workflowExecutionInstanceId() {
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
index b5847ba..4904dc1 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
@@ -607,8 +607,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b) {
   swap(a.taskIdentity, b.taskIdentity);
 }
 
-const char* TaskOutputChangeEvent::ascii_fingerprint = "DF5358F559BF0C15E8D7E438A1483AEA";
-const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xDF,0x53,0x58,0xF5,0x59,0xBF,0x0C,0x15,0xE8,0xD7,0xE4,0x38,0xA1,0x48,0x3A,0xEA};
+const char* TaskOutputChangeEvent::ascii_fingerprint = "F136B59B363FC26FD71A6D7EE9996A6B";
+const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xF1,0x36,0xB5,0x9B,0x36,0x3F,0xC2,0x6F,0xD7,0x1A,0x6D,0x7E,0xE9,0x99,0x6A,0x6B};
 
 uint32_t TaskOutputChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
index f96e816..5dba2b0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
@@ -354,8 +354,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b);
 class TaskOutputChangeEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "DF5358F559BF0C15E8D7E438A1483AEA";
-  static const uint8_t binary_fingerprint[16]; // = {0xDF,0x53,0x58,0xF5,0x59,0xBF,0x0C,0x15,0xE8,0xD7,0xE4,0x38,0xA1,0x48,0x3A,0xEA};
+  static const char* ascii_fingerprint; // = "F136B59B363FC26FD71A6D7EE9996A6B";
+  static const uint8_t binary_fingerprint[16]; // = {0xF1,0x36,0xB5,0x9B,0x36,0x3F,0xC2,0x6F,0xD7,0x1A,0x6D,0x7E,0xE9,0x99,0x6A,0x6B};
 
   TaskOutputChangeEvent() {
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
index fb7f03d..e6e7d28 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
@@ -27,8 +27,8 @@
 
 
 
-const char* Workflow::ascii_fingerprint = "0D4C41C8B641E56997DDA4AF85668A2D";
-const uint8_t Workflow::binary_fingerprint[16] = {0x0D,0x4C,0x41,0xC8,0xB6,0x41,0xE5,0x69,0x97,0xDD,0xA4,0xAF,0x85,0x66,0x8A,0x2D};
+const char* Workflow::ascii_fingerprint = "3C0FB89A672FDE904AE1E4DD71A863C6";
+const uint8_t Workflow::binary_fingerprint[16] = {0x3C,0x0F,0xB8,0x9A,0x67,0x2F,0xDE,0x90,0x4A,0xE1,0xE4,0xDD,0x71,0xA8,0x63,0xC6};
 
 uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
index bfe0f35..1911bc6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
@@ -46,8 +46,8 @@ typedef struct _Workflow__isset {
 class Workflow {
  public:
 
-  static const char* ascii_fingerprint; // = "0D4C41C8B641E56997DDA4AF85668A2D";
-  static const uint8_t binary_fingerprint[16]; // = {0x0D,0x4C,0x41,0xC8,0xB6,0x41,0xE5,0x69,0x97,0xDD,0xA4,0xAF,0x85,0x66,0x8A,0x2D};
+  static const char* ascii_fingerprint; // = "3C0FB89A672FDE904AE1E4DD71A863C6";
+  static const uint8_t binary_fingerprint[16]; // = {0x3C,0x0F,0xB8,0x9A,0x67,0x2F,0xDE,0x90,0x4A,0xE1,0xE4,0xDD,0x71,0xA8,0x63,0xC6};
 
   Workflow() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), image() {
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
index fa0abce..36031db 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -34,24 +34,6 @@ final class DataType {
   );
 }
 
-final class ValidityType {
-  const REQUIRED = 0;
-  const OPTIONAL = 1;
-  static public $__names = array(
-    0 => 'REQUIRED',
-    1 => 'OPTIONAL',
-  );
-}
-
-final class CommandLineType {
-  const IMPLICIT = 0;
-  const EXPLICIT = 1;
-  static public $__names = array(
-    0 => 'IMPLICIT',
-    1 => 'EXPLICIT',
-  );
-}
-
 class InputDataObjectType {
   static $_TSPEC;
 
@@ -63,8 +45,8 @@ class InputDataObjectType {
   public $userFriendlyDescription = null;
   public $metaData = null;
   public $inputOrder = null;
-  public $inputValid = null;
-  public $addedToCommandLine = null;
+  public $isRequired = null;
+  public $requiredToAddedToCommandLine = null;
   public $dataStaged = false;
 
   public function __construct($vals=null) {
@@ -103,12 +85,12 @@ class InputDataObjectType {
           'type' => TType::I32,
           ),
         9 => array(
-          'var' => 'inputValid',
-          'type' => TType::I32,
+          'var' => 'isRequired',
+          'type' => TType::BOOL,
           ),
         10 => array(
-          'var' => 'addedToCommandLine',
-          'type' => TType::I32,
+          'var' => 'requiredToAddedToCommandLine',
+          'type' => TType::BOOL,
           ),
         11 => array(
           'var' => 'dataStaged',
@@ -141,11 +123,11 @@ class InputDataObjectType {
       if (isset($vals['inputOrder'])) {
         $this->inputOrder = $vals['inputOrder'];
       }
-      if (isset($vals['inputValid'])) {
-        $this->inputValid = $vals['inputValid'];
+      if (isset($vals['isRequired'])) {
+        $this->isRequired = $vals['isRequired'];
       }
-      if (isset($vals['addedToCommandLine'])) {
-        $this->addedToCommandLine = $vals['addedToCommandLine'];
+      if (isset($vals['requiredToAddedToCommandLine'])) {
+        $this->requiredToAddedToCommandLine = $vals['requiredToAddedToCommandLine'];
       }
       if (isset($vals['dataStaged'])) {
         $this->dataStaged = $vals['dataStaged'];
@@ -229,15 +211,15 @@ class InputDataObjectType {
           }
           break;
         case 9:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->inputValid);
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->isRequired);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 10:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->addedToCommandLine);
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->requiredToAddedToCommandLine);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -302,14 +284,14 @@ class InputDataObjectType {
       $xfer += $output->writeI32($this->inputOrder);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->inputValid !== null) {
-      $xfer += $output->writeFieldBegin('inputValid', TType::I32, 9);
-      $xfer += $output->writeI32($this->inputValid);
+    if ($this->isRequired !== null) {
+      $xfer += $output->writeFieldBegin('isRequired', TType::BOOL, 9);
+      $xfer += $output->writeBool($this->isRequired);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->addedToCommandLine !== null) {
-      $xfer += $output->writeFieldBegin('addedToCommandLine', TType::I32, 10);
-      $xfer += $output->writeI32($this->addedToCommandLine);
+    if ($this->requiredToAddedToCommandLine !== null) {
+      $xfer += $output->writeFieldBegin('requiredToAddedToCommandLine', TType::BOOL, 10);
+      $xfer += $output->writeBool($this->requiredToAddedToCommandLine);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->dataStaged !== null) {
@@ -330,8 +312,8 @@ class OutputDataObjectType {
   public $name = null;
   public $value = null;
   public $type = null;
-  public $validityType = null;
-  public $addedToCommandLine = null;
+  public $isRequired = null;
+  public $requiredToAddedToCommandLine = null;
   public $dataMovement = null;
   public $dataNameLocation = null;
 
@@ -351,12 +333,12 @@ class OutputDataObjectType {
           'type' => TType::I32,
           ),
         4 => array(
-          'var' => 'validityType',
-          'type' => TType::I32,
+          'var' => 'isRequired',
+          'type' => TType::BOOL,
           ),
         5 => array(
-          'var' => 'addedToCommandLine',
-          'type' => TType::I32,
+          'var' => 'requiredToAddedToCommandLine',
+          'type' => TType::BOOL,
           ),
         6 => array(
           'var' => 'dataMovement',
@@ -378,11 +360,11 @@ class OutputDataObjectType {
       if (isset($vals['type'])) {
         $this->type = $vals['type'];
       }
-      if (isset($vals['validityType'])) {
-        $this->validityType = $vals['validityType'];
+      if (isset($vals['isRequired'])) {
+        $this->isRequired = $vals['isRequired'];
       }
-      if (isset($vals['addedToCommandLine'])) {
-        $this->addedToCommandLine = $vals['addedToCommandLine'];
+      if (isset($vals['requiredToAddedToCommandLine'])) {
+        $this->requiredToAddedToCommandLine = $vals['requiredToAddedToCommandLine'];
       }
       if (isset($vals['dataMovement'])) {
         $this->dataMovement = $vals['dataMovement'];
@@ -434,15 +416,15 @@ class OutputDataObjectType {
           }
           break;
         case 4:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->validityType);
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->isRequired);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 5:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->addedToCommandLine);
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->requiredToAddedToCommandLine);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -489,14 +471,14 @@ class OutputDataObjectType {
       $xfer += $output->writeI32($this->type);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->validityType !== null) {
-      $xfer += $output->writeFieldBegin('validityType', TType::I32, 4);
-      $xfer += $output->writeI32($this->validityType);
+    if ($this->isRequired !== null) {
+      $xfer += $output->writeFieldBegin('isRequired', TType::BOOL, 4);
+      $xfer += $output->writeBool($this->isRequired);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->addedToCommandLine !== null) {
-      $xfer += $output->writeFieldBegin('addedToCommandLine', TType::I32, 5);
-      $xfer += $output->writeI32($this->addedToCommandLine);
+    if ($this->requiredToAddedToCommandLine !== null) {
+      $xfer += $output->writeFieldBegin('requiredToAddedToCommandLine', TType::BOOL, 5);
+      $xfer += $output->writeBool($this->requiredToAddedToCommandLine);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->dataMovement !== null) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
index ac684a5..50bf15c 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
@@ -25,11 +25,9 @@ import org.apache.airavata.api.Airavata;
 import org.apache.airavata.api.client.AiravataClientFactory;
 import org.apache.airavata.client.tools.RegisterSampleApplicationsUtils;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
-import org.apache.airavata.model.appcatalog.appinterface.CommandLineType;
 import org.apache.airavata.model.appcatalog.appinterface.DataType;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.appcatalog.appinterface.ValidityType;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
@@ -134,13 +132,13 @@ public class RegisterSampleData {
             appModules.add(gaussianModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("MainInputFile", null,
-                    DataType.URI, null, 1,null, null, false, "Gaussian main input file", null);
+                    DataType.URI, null, 1,true,true, false, "Gaussian main input file", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("gaussian.out",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true,true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -163,19 +161,19 @@ public class RegisterSampleData {
             appModules.add(monteXModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("xyzf", "O16.xyz",
-                    DataType.STRING, null, 1, null, null, false, "Tinker monte input_1", null);
+                    DataType.STRING, null, 1, true,true, false, "Tinker monte input_1", null);
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("keyf", "O16.key",
-                    DataType.STRING, "-k", 2, null, null, false, "Tinker monte input_2", null);
+                    DataType.STRING, "-k", 2, true,true, false, "Tinker monte input_2", null);
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("stps", "20000",
-                    DataType.STRING, null, 3, null, null, false, "Tinker monte input_3", null);
+                    DataType.STRING, null, 3, true,true, false, "Tinker monte input_3", null);
             InputDataObjectType input4 = RegisterSampleApplicationsUtils.createAppInput("Ctc", "C",
-                    DataType.STRING, null, 4, null, null, false, "Tinker monte input_4", null);
+                    DataType.STRING, null, 4, true,true, false, "Tinker monte input_4", null);
             InputDataObjectType input5 = RegisterSampleApplicationsUtils.createAppInput("stpsZ", "3.0",
-                    DataType.STRING, null, 5, null, null, false, "Tinker monte input_5", null);
+                    DataType.STRING, null, 5, true,true, false, "Tinker monte input_5", null);
             InputDataObjectType input6 = RegisterSampleApplicationsUtils.createAppInput("temp", "298",
-                    DataType.STRING, null, 6, null, null, false, "Tinker monte input_6", null);
+                    DataType.STRING, null, 6, true,true, false, "Tinker monte input_6", null);
             InputDataObjectType input7 = RegisterSampleApplicationsUtils.createAppInput("Rconv", "0.01",
-                    DataType.STRING, null, 7, null, null, false, "Tinker monte input_7", null);
+                    DataType.STRING, null, 7, true,true, false, "Tinker monte input_7", null);
 
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
@@ -188,7 +186,7 @@ public class RegisterSampleData {
             applicationInputs.add(input7);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Diskoutputfile_with_dir",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true,false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -286,13 +284,13 @@ public class RegisterSampleData {
             appModules.add(echoModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World",
-                    DataType.STRING, null, 1, null, null, false, "A test string to Echo", null);
+                    DataType.STRING, null, 1, true,true, false, "A test string to Echo", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
-                    "", DataType.STRING, null, null);
+                    "", DataType.STRING, true, false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -315,16 +313,16 @@ public class RegisterSampleData {
             appModules.add(addModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "2",
-                    DataType.STRING, null, 1, null, null, false, "Add operation input_1", null);
+                    DataType.STRING, null, 1, true,true, false, "Add operation input_1", null);
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "3",
-                    DataType.STRING, null, 2, null, null, false, "Add operation input_2", null);
+                    DataType.STRING, null, 2, true,true, false, "Add operation input_2", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Result",
-                    "0", DataType.STRING, null, null);
+                    "0", DataType.STRING, true,false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -347,16 +345,16 @@ public class RegisterSampleData {
             appModules.add(multiplyModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "4",
-                    DataType.STRING, null, 1,null, null, false, "Multiply operation input_1", null);
+                    DataType.STRING, null, 1,true,true, false, "Multiply operation input_1", null);
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "5",
-                    DataType.STRING, null, 2, null, null, false, "Multiply operation input_2", null);
+                    DataType.STRING, null, 2, true,true, false, "Multiply operation input_2", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Result",
-                    "0", DataType.STRING,null, null);
+                    "0", DataType.STRING,true,false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -379,16 +377,16 @@ public class RegisterSampleData {
             appModules.add(subtractModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "6",
-                    DataType.STRING, null, 1,null, null, false, "Subtract operation input_1", null);
+                    DataType.STRING, null, 1,true,true, false, "Subtract operation input_1", null);
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "7",
-                    DataType.STRING, null, 2,null, null, false, "Subtract operation input_2", null);
+                    DataType.STRING, null, 2,true,true, false, "Subtract operation input_2", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Result",
-                    "0", DataType.STRING, null, null);
+                    "0", DataType.STRING, true,false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
index c99cc8b..3cebeb5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
@@ -175,13 +175,13 @@ public class RegisterOGCEUS3Application {
             appModules.add(ultrascanModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null,
-                    DataType.URI, null, 1,null, null, false, "input tar file", null);
+                    DataType.URI, null, 1,true,true, false, "input tar file", null);
            
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("output",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true, false);
 
 //            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("stdout",
 //                    "", DataType.URI);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index dd08228..13603d5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -398,21 +398,21 @@ public class RegisterSampleApplications {
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("gams_input", "",
-                    DataType.URI, null, 1, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Gamess Input file", null));
+                    DataType.URI, null, 1, true, false, false, "Gamess Input file", null));
 //            applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("EXT_FILE", "",
 //                    DataType.URI, null, 2, ValidityType.OPTIONAL, CommandLineType.EXCLUSIVE, false, "Gamess EXT file", null));
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("gams_output",
-                    "", DataType.URI, ValidityType.REQUIRED, CommandLineType.IMPLICIT));
+                    "", DataType.URI, true, false));
             applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("dat_file",
-                    "", DataType.URI, ValidityType.REQUIRED, CommandLineType.EXPLICIT));
+                    "", DataType.URI, true, true));
             applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("trj_file",
-                    "", DataType.URI, ValidityType.OPTIONAL, CommandLineType.EXPLICIT));
+                    "", DataType.URI, false, true));
             applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("rst_file",
-                    "", DataType.URI, ValidityType.OPTIONAL, CommandLineType.EXPLICIT));
+                    "", DataType.URI, false, true));
             applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("f10_file",
-                    "", DataType.URI, ValidityType.OPTIONAL, CommandLineType.EXPLICIT));
+                    "", DataType.URI, false, true));
 
 
             gamessInterfaceId = airavataClient.registerApplicationInterface(
@@ -434,13 +434,13 @@ public class RegisterSampleApplications {
             appModules.add(echoModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("echo_input", "echo_output=Hello World",
-                    DataType.STRING, null, 1,null, null, false, "A test string to Echo", null);
+                    DataType.STRING, null, 1,false, false, false, "A test string to Echo", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("echo_output",
-                    "", DataType.STRING, null, null);
+                    "", DataType.STRING, false, false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -464,20 +464,20 @@ public class RegisterSampleApplications {
 
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "",
-                    DataType.STRING, null, 1, null, null,false, "A test string to Echo", null);
+                    DataType.STRING, null, 1, false, false,false, "A test string to Echo", null);
             
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo2", "",
-                    DataType.URI, null, 2, null, null,false, "A sample input remote file", null);
+                    DataType.URI, null, 2, false, false,false, "A sample input remote file", null);
 
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo3", "file:///tmp/test.txt",
-                    DataType.URI, null, 3,null, null, false, "A sample input local file", null);
+                    DataType.URI, null, 3,false, false, false, "A sample input local file", null);
 
             
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1); applicationInputs.add(input2); applicationInputs.add(input3);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
-                    "", DataType.STRING, null, null);
+                    "", DataType.STRING, false, false);
             
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -502,13 +502,13 @@ public class RegisterSampleApplications {
             appModules.add(mpiModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Sample_Input", "",
-                    DataType.STRING, null, 1,null, null, false, "An optional MPI source file", null);
+                    DataType.STRING, null, 1,true, false, false, "An optional MPI source file", null);
             
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Sample_Output",
-                    "", DataType.STRING, null, null);
+                    "", DataType.STRING, false, false);
             
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -533,23 +533,23 @@ public class RegisterSampleApplications {
             appModules.add(amberModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Heat_Restart_File", null,
-                    DataType.URI, null, 1, null, null,false, "Heating up the system equilibration stage - 02_Heat.rst", null);
+                    DataType.URI, null, 1, true, true,false, "Heating up the system equilibration stage - 02_Heat.rst", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Production_Control_File", null,
-                    DataType.URI, null, 2,null, null, false, "Constant pressure and temperature for production stage - 03_Prod.in", null);
+                    DataType.URI, null, 2,true, true, false, "Constant pressure and temperature for production stage - 03_Prod.in", null);
 
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Parameter_Topology_File", null,
-                    DataType.URI, null, 3,null, null, false, "Parameter and Topology coordinates - prmtop", null);
+                    DataType.URI, null, 3,true, true, false, "Parameter and Topology coordinates - prmtop", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
             applicationInputs.add(input3);
 
-            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Execution_Summary",null,DataType.URI, null, null);
-            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Execution_log",null,DataType.URI, null, null);
-            OutputDataObjectType output3 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Trajectory_file",null,DataType.URI, null, null);
-            OutputDataObjectType output4 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Restart_file",null,DataType.URI, null, null);
+            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Execution_Summary",null,DataType.URI, true, true);
+            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Execution_log",null,DataType.URI, true, true);
+            OutputDataObjectType output3 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Trajectory_file",null,DataType.URI, true, true);
+            OutputDataObjectType output4 = RegisterSampleApplicationsUtils.createAppOutput("AMBER_Restart_file",null,DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -575,13 +575,13 @@ public class RegisterSampleApplications {
             appModules.add(autoDockModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Heat_Restart_File", null,
-                    DataType.URI, null, 1,null, null, false, "Heating up the system equilibration stage", null);
+                    DataType.URI, null, 1,true, true, false, "Heating up the system equilibration stage", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Production_Control_File", null,
-                    DataType.URI, null, 2,null, null, false, "Constant pressure and temperature for production stage", null);
+                    DataType.URI, null, 2,true, true, false, "Constant pressure and temperature for production stage", null);
 
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Parameter_Topology_File", null,
-                    DataType.URI, null, 3,null, null, false, "Parameter and Topology coordinates", null);
+                    DataType.URI, null, 3,true, true, false, "Parameter and Topology coordinates", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
@@ -589,7 +589,7 @@ public class RegisterSampleApplications {
             applicationInputs.add(input3);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
-                    "", DataType.STRING, null, null);
+                    "", DataType.STRING, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -612,17 +612,17 @@ public class RegisterSampleApplications {
             appModules.add(espressoModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("AI_Primitive_Cell", null,
-                    DataType.URI, null, 1, null, null,false, "AI_Metal_Input_File - Al.sample.in", null);
+                    DataType.URI, null, 1, true, true,false, "AI_Metal_Input_File - Al.sample.in", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("AI_Pseudopotential_File", null,
-                    DataType.URI, null, 2, null, null,false, "Constant pressure and temperature for production stage - Al.pz-vbc.UPF", null);
+                    DataType.URI, null, 2, true, true,false, "Constant pressure and temperature for production stage - Al.pz-vbc.UPF", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
 
-            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("ESPRESSO_Execution_Log",null,DataType.URI, null, null);
-            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("ESPRESSO_WFC_Binary_file",null,DataType.URI, null, null);
+            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("ESPRESSO_Execution_Log",null,DataType.URI, true, true);
+            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("ESPRESSO_WFC_Binary_file",null,DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -646,18 +646,18 @@ public class RegisterSampleApplications {
             appModules.add(gromacsModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Portable_Input_Binary_File", null,
-                    DataType.URI, null, 1, null, null, false, "Coordinates velocities, molecular topology and simulation parameters - pdb1y6l-EM-vacuum.tpr", null);
+                    DataType.URI, null, 1, true, true, false, "Coordinates velocities, molecular topology and simulation parameters - pdb1y6l-EM-vacuum.tpr", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("GROMOS_Coordinate_File", null,
-                    DataType.URI, null, 2, null, null,false, "Trajectory Coordinates Molecular Structure in Gromos87 format - pdb1y6l-EM-vacuum.gro", null);
+                    DataType.URI, null, 2, true, true,false, "Trajectory Coordinates Molecular Structure in Gromos87 format - pdb1y6l-EM-vacuum.gro", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
 
-            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("GROMACS_Execution_Log",null,DataType.URI, null, null);
-            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("Full_Precision_Trajectory_file",null,DataType.URI, null, null);
-            OutputDataObjectType output3 = RegisterSampleApplicationsUtils.createAppOutput("Portable_Energy_file",null,DataType.URI, null, null);
+            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("GROMACS_Execution_Log",null,DataType.URI, true, true);
+            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("Full_Precision_Trajectory_file",null,DataType.URI, true, true);
+            OutputDataObjectType output3 = RegisterSampleApplicationsUtils.createAppOutput("Portable_Energy_file",null,DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -682,12 +682,12 @@ public class RegisterSampleApplications {
             appModules.add(lammpsModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Friction_Simulation_Input", null,
-                    DataType.URI, "<", 1,ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Friction Simulation Input - in.friction", null);
+                    DataType.URI, "<", 1,true, true, false, "Friction Simulation Input - in.friction", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
-            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("LAMMPS_Simulation_Log",null,DataType.URI, null, null);
+            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("LAMMPS_Simulation_Log",null,DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -710,13 +710,13 @@ public class RegisterSampleApplications {
             appModules.add(nwChemModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Water_Molecule_Input", null,
-                    DataType.URI, null, 1,ValidityType.REQUIRED , CommandLineType.IMPLICIT, false, "Water Molecule Input File - water.nw", null);
+                    DataType.URI, null, 1,true , true, false, "Water Molecule Input File - water.nw", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("NWChem_Execution_Log",
-                    null, DataType.URI, ValidityType.REQUIRED, CommandLineType.IMPLICIT);
+                    null, DataType.URI, true, false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -740,17 +740,17 @@ public class RegisterSampleApplications {
             appModules.add(trinityModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("RNA_Seq_Left_Input", null,
-                    DataType.URI, null, 1,null, null, false, "RNA-Seq Left Library - reads.left.fq", null);
+                    DataType.URI, null, 1,true, true, false, "RNA-Seq Left Library - reads.left.fq", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("RNA_Seq_Right_Input", null,
-                    DataType.URI, null, 2, null, null,false, "RNA-Seq Right Library - reads.right.fq", null);
+                    DataType.URI, null, 2, true, true,false, "RNA-Seq Right Library - reads.right.fq", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
 
-            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Trinity_Execution_Log",null,DataType.URI, null, null);
-            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("Trinity_FASTA_File",null,DataType.URI, null, null);
+            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Trinity_Execution_Log",null,DataType.URI, true, true);
+            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("Trinity_FASTA_File",null,DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -775,13 +775,13 @@ public class RegisterSampleApplications {
             appModules.add(wrfModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Config_Namelist_File", null,
-                    DataType.URI, null, 1,null, null, false, "Namelist Configuration File - namelist.input", null);
+                    DataType.URI, null, 1,true, true, false, "Namelist Configuration File - namelist.input", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("WRF_Initial_Conditions", null,
-                    DataType.URI, null, 2, null, null,false, "Initial Conditions File - wrfinput_d01", null);
+                    DataType.URI, null, 2, true, true,false, "Initial Conditions File - wrfinput_d01", null);
 
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("WRF_Boundary_File", null,
-                    DataType.URI, null, 3,null, null, false, "Boundary Conditions File - wrfbdy_d01", null);
+                    DataType.URI, null, 3,true, true, false, "Boundary Conditions File - wrfbdy_d01", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
@@ -789,10 +789,10 @@ public class RegisterSampleApplications {
             applicationInputs.add(input3);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("WRF_Output",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true, true);
 
             OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("WRF_Execution_Log",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -816,21 +816,21 @@ public class RegisterSampleApplications {
             appModules.add(phastaModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Parasolid_Geometric_Model", null,
-                    DataType.URI, null, 1, null, null,false, "Parasolid geometric model - geom.xmt_txt", null);
+                    DataType.URI, null, 1, true, true,false, "Parasolid geometric model - geom.xmt_txt", null);
 
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Problem_Definition", null,
-                    DataType.URI, null, 2,null, null, false, "problem definition - geom.smd", null);
+                    DataType.URI, null, 2,true, true, false, "problem definition - geom.smd", null);
 
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Mesh_Description_File", null,
-                    DataType.URI, null, 3, null, null,false, "Mesh Description - geom.sms", null);
+                    DataType.URI, null, 3, true, true,false, "Mesh Description - geom.sms", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
             applicationInputs.add(input2);
             applicationInputs.add(input3);
 
-            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("PHASTA_Execution_Log",null,DataType.URI, null, null);
-            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("PHASTA_Output_tar",null,DataType.URI, null, null);
+            OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("PHASTA_Execution_Log",null,DataType.URI, true, true);
+            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("PHASTA_Output_tar",null,DataType.URI, true, true);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -869,13 +869,13 @@ public class RegisterSampleApplications {
             appModules.add(gaussianModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("MainInputFile", null,
-                    DataType.URI, null, 1, ValidityType.REQUIRED, CommandLineType.IMPLICIT,  false, "Gaussian main input file", null);
+                    DataType.URI, null, 1, true, true,  false, "Gaussian main input file", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("gaussian.out",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true, true );
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);
@@ -898,19 +898,19 @@ public class RegisterSampleApplications {
             appModules.add(monteXModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("xyzf", "O16.xyz",
-                    DataType.URI, null, 1, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Tinker monte input_1", null);
+                    DataType.URI, null, 1, true, true, false, "Tinker monte input_1", null);
             InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("keyf", "O16.key",
-                    DataType.URI, "-k", 2, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Tinker monte input_2", null);
+                    DataType.URI, "-k", 2, true, true, false, "Tinker monte input_2", null);
             InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("stps", "20000",
-                    DataType.STRING, null, 3, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Tinker monte input_3", null);
+                    DataType.STRING, null, 3, true, true, false, "Tinker monte input_3", null);
             InputDataObjectType input4 = RegisterSampleApplicationsUtils.createAppInput("Ctc", "C",
-                    DataType.STRING, null, 4, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Tinker monte input_4", null);
+                    DataType.STRING, null, 4, true, true, false, "Tinker monte input_4", null);
             InputDataObjectType input5 = RegisterSampleApplicationsUtils.createAppInput("stpsZ", "3.0",
-                    DataType.STRING, null, 5, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Tinker monte input_5", null);
+                    DataType.STRING, null, 5, true, true, false, "Tinker monte input_5", null);
             InputDataObjectType input6 = RegisterSampleApplicationsUtils.createAppInput("temp", "298",
-                    DataType.STRING, null, 6, ValidityType.REQUIRED, CommandLineType.IMPLICIT, false, "Tinker monte input_6", null);
+                    DataType.STRING, null, 6, true, true, false, "Tinker monte input_6", null);
             InputDataObjectType input7 = RegisterSampleApplicationsUtils.createAppInput("Rconv", "0.01",
-                    DataType.STRING, null, 7, ValidityType.REQUIRED, CommandLineType.IMPLICIT,  false, "Tinker monte input_7", null);
+                    DataType.STRING, null, 7, true, true,  false, "Tinker monte input_7", null);
 
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
@@ -922,7 +922,7 @@ public class RegisterSampleApplications {
             applicationInputs.add(input7);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Diskoutputfile_with_dir",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, false, false);
 
             List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
             applicationOutputs.add(output1);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
index e31bf9c..86f7d1a 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
@@ -128,8 +128,8 @@ public class RegisterSampleApplicationsUtils {
                                                       DataType type,
                                                       String applicationArgument,
                                                       int order,
-                                                      ValidityType validityType,
-                                                      CommandLineType commandLineType,
+                                                      boolean isRequired,
+                                                      boolean requiredToCMD,
                                                       boolean stdIn,
                                                       String description,
                                                       String metadata) {
@@ -140,12 +140,8 @@ public class RegisterSampleApplicationsUtils {
         if (type != null) input.setType(type);
         if (applicationArgument != null) input.setApplicationArgument(applicationArgument);
         input.setInputOrder(order);
-        if (validityType != null){
-            input.setInputValid(validityType);
-        }
-        if (commandLineType != null){
-            input.setAddedToCommandLine(commandLineType);
-        }
+        input.setIsRequired(isRequired);
+        input.setRequiredToAddedToCommandLine(requiredToCMD);
         if (description != null) input.setUserFriendlyDescription(description);
         input.setStandardInput(stdIn);
         if (metadata != null) input.setMetaData(metadata);
@@ -155,19 +151,15 @@ public class RegisterSampleApplicationsUtils {
     public static OutputDataObjectType createAppOutput(String inputName,
                                                        String value,
                                                        DataType type,
-                                                       ValidityType validityType,
-                                                       CommandLineType commandLineType) {
+                                                       boolean isRequired,
+                                                       boolean requiredToCMD) {
         OutputDataObjectType outputDataObjectType = new OutputDataObjectType();
 //        outputDataObjectType.setIsEmpty(false);
         if (inputName != null) outputDataObjectType.setName(inputName);
         if (value != null) outputDataObjectType.setValue(value);
         if (type != null) outputDataObjectType.setType(type);
-        if (validityType != null){
-            outputDataObjectType.setValidityType(validityType);
-        }
-        if (commandLineType != null){
-            outputDataObjectType.setAddedToCommandLine(commandLineType);
-        }
+        outputDataObjectType.setIsRequired(isRequired);
+        outputDataObjectType.setRequiredToAddedToCommandLine(requiredToCMD);
         return outputDataObjectType;
     }
 


[3/4] airavata git commit: changing validity type and addedToCMD to boolean

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
index 7c67dea..a0fcba3 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
@@ -175,13 +175,13 @@ public class RegisterUS3Application {
             appModules.add(ultrascanModuleId);
 
             InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null,
-                    DataType.URI, null, 1,null, null, false, "input tar file", null);
+                    DataType.URI, null, 1,true, true, false, "input tar file", null);
            
             List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
             applicationInputs.add(input1);
 
             OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("output",
-                    "", DataType.URI, null, null);
+                    "", DataType.URI, true, false);
 
 //            OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("stdout",
 //                    "", DataType.URI);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/CommandLineType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/CommandLineType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/CommandLineType.java
deleted file mode 100644
index a24a524..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/CommandLineType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.appinterface;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-@SuppressWarnings("all") public enum CommandLineType implements org.apache.thrift.TEnum {
-  IMPLICIT(0),
-  EXPLICIT(1);
-
-  private final int value;
-
-  private CommandLineType(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static CommandLineType findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return IMPLICIT;
-      case 1:
-        return EXPLICIT;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
index 8ab0b46..eb7bf3f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
@@ -86,8 +86,8 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)6);
   private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)7);
   private static final org.apache.thrift.protocol.TField INPUT_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("inputOrder", org.apache.thrift.protocol.TType.I32, (short)8);
-  private static final org.apache.thrift.protocol.TField INPUT_VALID_FIELD_DESC = new org.apache.thrift.protocol.TField("inputValid", org.apache.thrift.protocol.TType.I32, (short)9);
-  private static final org.apache.thrift.protocol.TField ADDED_TO_COMMAND_LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("addedToCommandLine", org.apache.thrift.protocol.TType.I32, (short)10);
+  private static final org.apache.thrift.protocol.TField IS_REQUIRED_FIELD_DESC = new org.apache.thrift.protocol.TField("isRequired", org.apache.thrift.protocol.TType.BOOL, (short)9);
+  private static final org.apache.thrift.protocol.TField REQUIRED_TO_ADDED_TO_COMMAND_LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("requiredToAddedToCommandLine", org.apache.thrift.protocol.TType.BOOL, (short)10);
   private static final org.apache.thrift.protocol.TField DATA_STAGED_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStaged", org.apache.thrift.protocol.TType.BOOL, (short)11);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -104,8 +104,8 @@ import org.slf4j.LoggerFactory;
   private String userFriendlyDescription; // optional
   private String metaData; // optional
   private int inputOrder; // optional
-  private ValidityType inputValid; // optional
-  private CommandLineType addedToCommandLine; // optional
+  private boolean isRequired; // optional
+  private boolean requiredToAddedToCommandLine; // optional
   private boolean dataStaged; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -122,16 +122,8 @@ import org.slf4j.LoggerFactory;
     USER_FRIENDLY_DESCRIPTION((short)6, "userFriendlyDescription"),
     META_DATA((short)7, "metaData"),
     INPUT_ORDER((short)8, "inputOrder"),
-    /**
-     * 
-     * @see ValidityType
-     */
-    INPUT_VALID((short)9, "inputValid"),
-    /**
-     * 
-     * @see CommandLineType
-     */
-    ADDED_TO_COMMAND_LINE((short)10, "addedToCommandLine"),
+    IS_REQUIRED((short)9, "isRequired"),
+    REQUIRED_TO_ADDED_TO_COMMAND_LINE((short)10, "requiredToAddedToCommandLine"),
     DATA_STAGED((short)11, "dataStaged");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -163,10 +155,10 @@ import org.slf4j.LoggerFactory;
           return META_DATA;
         case 8: // INPUT_ORDER
           return INPUT_ORDER;
-        case 9: // INPUT_VALID
-          return INPUT_VALID;
-        case 10: // ADDED_TO_COMMAND_LINE
-          return ADDED_TO_COMMAND_LINE;
+        case 9: // IS_REQUIRED
+          return IS_REQUIRED;
+        case 10: // REQUIRED_TO_ADDED_TO_COMMAND_LINE
+          return REQUIRED_TO_ADDED_TO_COMMAND_LINE;
         case 11: // DATA_STAGED
           return DATA_STAGED;
         default:
@@ -211,9 +203,11 @@ import org.slf4j.LoggerFactory;
   // isset id assignments
   private static final int __STANDARDINPUT_ISSET_ID = 0;
   private static final int __INPUTORDER_ISSET_ID = 1;
-  private static final int __DATASTAGED_ISSET_ID = 2;
+  private static final int __ISREQUIRED_ISSET_ID = 2;
+  private static final int __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID = 3;
+  private static final int __DATASTAGED_ISSET_ID = 4;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA,_Fields.INPUT_ORDER,_Fields.INPUT_VALID,_Fields.ADDED_TO_COMMAND_LINE,_Fields.DATA_STAGED};
+  private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA,_Fields.INPUT_ORDER,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_STAGED};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -233,10 +227,10 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.INPUT_ORDER, new org.apache.thrift.meta_data.FieldMetaData("inputOrder", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.INPUT_VALID, new org.apache.thrift.meta_data.FieldMetaData("inputValid", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ValidityType.class)));
-    tmpMap.put(_Fields.ADDED_TO_COMMAND_LINE, new org.apache.thrift.meta_data.FieldMetaData("addedToCommandLine", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CommandLineType.class)));
+    tmpMap.put(_Fields.IS_REQUIRED, new org.apache.thrift.meta_data.FieldMetaData("isRequired", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE, new org.apache.thrift.meta_data.FieldMetaData("requiredToAddedToCommandLine", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.DATA_STAGED, new org.apache.thrift.meta_data.FieldMetaData("dataStaged", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -282,12 +276,8 @@ import org.slf4j.LoggerFactory;
       this.metaData = other.metaData;
     }
     this.inputOrder = other.inputOrder;
-    if (other.isSetInputValid()) {
-      this.inputValid = other.inputValid;
-    }
-    if (other.isSetAddedToCommandLine()) {
-      this.addedToCommandLine = other.addedToCommandLine;
-    }
+    this.isRequired = other.isRequired;
+    this.requiredToAddedToCommandLine = other.requiredToAddedToCommandLine;
     this.dataStaged = other.dataStaged;
   }
 
@@ -307,8 +297,10 @@ import org.slf4j.LoggerFactory;
     this.metaData = null;
     setInputOrderIsSet(false);
     this.inputOrder = 0;
-    this.inputValid = null;
-    this.addedToCommandLine = null;
+    setIsRequiredIsSet(false);
+    this.isRequired = false;
+    setRequiredToAddedToCommandLineIsSet(false);
+    this.requiredToAddedToCommandLine = false;
     this.dataStaged = false;
 
   }
@@ -503,66 +495,48 @@ import org.slf4j.LoggerFactory;
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INPUTORDER_ISSET_ID, value);
   }
 
-  /**
-   * 
-   * @see ValidityType
-   */
-  public ValidityType getInputValid() {
-    return this.inputValid;
+  public boolean isIsRequired() {
+    return this.isRequired;
   }
 
-  /**
-   * 
-   * @see ValidityType
-   */
-  public void setInputValid(ValidityType inputValid) {
-    this.inputValid = inputValid;
+  public void setIsRequired(boolean isRequired) {
+    this.isRequired = isRequired;
+    setIsRequiredIsSet(true);
   }
 
-  public void unsetInputValid() {
-    this.inputValid = null;
+  public void unsetIsRequired() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
-  /** Returns true if field inputValid is set (has been assigned a value) and false otherwise */
-  public boolean isSetInputValid() {
-    return this.inputValid != null;
+  /** Returns true if field isRequired is set (has been assigned a value) and false otherwise */
+  public boolean isSetIsRequired() {
+    return EncodingUtils.testBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
-  public void setInputValidIsSet(boolean value) {
-    if (!value) {
-      this.inputValid = null;
-    }
+  public void setIsRequiredIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISREQUIRED_ISSET_ID, value);
   }
 
-  /**
-   * 
-   * @see CommandLineType
-   */
-  public CommandLineType getAddedToCommandLine() {
-    return this.addedToCommandLine;
+  public boolean isRequiredToAddedToCommandLine() {
+    return this.requiredToAddedToCommandLine;
   }
 
-  /**
-   * 
-   * @see CommandLineType
-   */
-  public void setAddedToCommandLine(CommandLineType addedToCommandLine) {
-    this.addedToCommandLine = addedToCommandLine;
+  public void setRequiredToAddedToCommandLine(boolean requiredToAddedToCommandLine) {
+    this.requiredToAddedToCommandLine = requiredToAddedToCommandLine;
+    setRequiredToAddedToCommandLineIsSet(true);
   }
 
-  public void unsetAddedToCommandLine() {
-    this.addedToCommandLine = null;
+  public void unsetRequiredToAddedToCommandLine() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
-  /** Returns true if field addedToCommandLine is set (has been assigned a value) and false otherwise */
-  public boolean isSetAddedToCommandLine() {
-    return this.addedToCommandLine != null;
+  /** Returns true if field requiredToAddedToCommandLine is set (has been assigned a value) and false otherwise */
+  public boolean isSetRequiredToAddedToCommandLine() {
+    return EncodingUtils.testBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
-  public void setAddedToCommandLineIsSet(boolean value) {
-    if (!value) {
-      this.addedToCommandLine = null;
-    }
+  public void setRequiredToAddedToCommandLineIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID, value);
   }
 
   public boolean isDataStaged() {
@@ -653,19 +627,19 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case INPUT_VALID:
+    case IS_REQUIRED:
       if (value == null) {
-        unsetInputValid();
+        unsetIsRequired();
       } else {
-        setInputValid((ValidityType)value);
+        setIsRequired((Boolean)value);
       }
       break;
 
-    case ADDED_TO_COMMAND_LINE:
+    case REQUIRED_TO_ADDED_TO_COMMAND_LINE:
       if (value == null) {
-        unsetAddedToCommandLine();
+        unsetRequiredToAddedToCommandLine();
       } else {
-        setAddedToCommandLine((CommandLineType)value);
+        setRequiredToAddedToCommandLine((Boolean)value);
       }
       break;
 
@@ -706,11 +680,11 @@ import org.slf4j.LoggerFactory;
     case INPUT_ORDER:
       return Integer.valueOf(getInputOrder());
 
-    case INPUT_VALID:
-      return getInputValid();
+    case IS_REQUIRED:
+      return Boolean.valueOf(isIsRequired());
 
-    case ADDED_TO_COMMAND_LINE:
-      return getAddedToCommandLine();
+    case REQUIRED_TO_ADDED_TO_COMMAND_LINE:
+      return Boolean.valueOf(isRequiredToAddedToCommandLine());
 
     case DATA_STAGED:
       return Boolean.valueOf(isDataStaged());
@@ -742,10 +716,10 @@ import org.slf4j.LoggerFactory;
       return isSetMetaData();
     case INPUT_ORDER:
       return isSetInputOrder();
-    case INPUT_VALID:
-      return isSetInputValid();
-    case ADDED_TO_COMMAND_LINE:
-      return isSetAddedToCommandLine();
+    case IS_REQUIRED:
+      return isSetIsRequired();
+    case REQUIRED_TO_ADDED_TO_COMMAND_LINE:
+      return isSetRequiredToAddedToCommandLine();
     case DATA_STAGED:
       return isSetDataStaged();
     }
@@ -837,21 +811,21 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_inputValid = true && this.isSetInputValid();
-    boolean that_present_inputValid = true && that.isSetInputValid();
-    if (this_present_inputValid || that_present_inputValid) {
-      if (!(this_present_inputValid && that_present_inputValid))
+    boolean this_present_isRequired = true && this.isSetIsRequired();
+    boolean that_present_isRequired = true && that.isSetIsRequired();
+    if (this_present_isRequired || that_present_isRequired) {
+      if (!(this_present_isRequired && that_present_isRequired))
         return false;
-      if (!this.inputValid.equals(that.inputValid))
+      if (this.isRequired != that.isRequired)
         return false;
     }
 
-    boolean this_present_addedToCommandLine = true && this.isSetAddedToCommandLine();
-    boolean that_present_addedToCommandLine = true && that.isSetAddedToCommandLine();
-    if (this_present_addedToCommandLine || that_present_addedToCommandLine) {
-      if (!(this_present_addedToCommandLine && that_present_addedToCommandLine))
+    boolean this_present_requiredToAddedToCommandLine = true && this.isSetRequiredToAddedToCommandLine();
+    boolean that_present_requiredToAddedToCommandLine = true && that.isSetRequiredToAddedToCommandLine();
+    if (this_present_requiredToAddedToCommandLine || that_present_requiredToAddedToCommandLine) {
+      if (!(this_present_requiredToAddedToCommandLine && that_present_requiredToAddedToCommandLine))
         return false;
-      if (!this.addedToCommandLine.equals(that.addedToCommandLine))
+      if (this.requiredToAddedToCommandLine != that.requiredToAddedToCommandLine)
         return false;
     }
 
@@ -960,22 +934,22 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetInputValid()).compareTo(other.isSetInputValid());
+    lastComparison = Boolean.valueOf(isSetIsRequired()).compareTo(other.isSetIsRequired());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetInputValid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputValid, other.inputValid);
+    if (isSetIsRequired()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isRequired, other.isRequired);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAddedToCommandLine()).compareTo(other.isSetAddedToCommandLine());
+    lastComparison = Boolean.valueOf(isSetRequiredToAddedToCommandLine()).compareTo(other.isSetRequiredToAddedToCommandLine());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetAddedToCommandLine()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.addedToCommandLine, other.addedToCommandLine);
+    if (isSetRequiredToAddedToCommandLine()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requiredToAddedToCommandLine, other.requiredToAddedToCommandLine);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1079,24 +1053,16 @@ import org.slf4j.LoggerFactory;
       sb.append(this.inputOrder);
       first = false;
     }
-    if (isSetInputValid()) {
+    if (isSetIsRequired()) {
       if (!first) sb.append(", ");
-      sb.append("inputValid:");
-      if (this.inputValid == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.inputValid);
-      }
+      sb.append("isRequired:");
+      sb.append(this.isRequired);
       first = false;
     }
-    if (isSetAddedToCommandLine()) {
+    if (isSetRequiredToAddedToCommandLine()) {
       if (!first) sb.append(", ");
-      sb.append("addedToCommandLine:");
-      if (this.addedToCommandLine == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.addedToCommandLine);
-      }
+      sb.append("requiredToAddedToCommandLine:");
+      sb.append(this.requiredToAddedToCommandLine);
       first = false;
     }
     if (isSetDataStaged()) {
@@ -1218,18 +1184,18 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 9: // INPUT_VALID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.inputValid = ValidityType.findByValue(iprot.readI32());
-              struct.setInputValidIsSet(true);
+          case 9: // IS_REQUIRED
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.isRequired = iprot.readBool();
+              struct.setIsRequiredIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 10: // ADDED_TO_COMMAND_LINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.addedToCommandLine = CommandLineType.findByValue(iprot.readI32());
-              struct.setAddedToCommandLineIsSet(true);
+          case 10: // REQUIRED_TO_ADDED_TO_COMMAND_LINE
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.requiredToAddedToCommandLine = iprot.readBool();
+              struct.setRequiredToAddedToCommandLineIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1305,19 +1271,15 @@ import org.slf4j.LoggerFactory;
         oprot.writeI32(struct.inputOrder);
         oprot.writeFieldEnd();
       }
-      if (struct.inputValid != null) {
-        if (struct.isSetInputValid()) {
-          oprot.writeFieldBegin(INPUT_VALID_FIELD_DESC);
-          oprot.writeI32(struct.inputValid.getValue());
-          oprot.writeFieldEnd();
-        }
+      if (struct.isSetIsRequired()) {
+        oprot.writeFieldBegin(IS_REQUIRED_FIELD_DESC);
+        oprot.writeBool(struct.isRequired);
+        oprot.writeFieldEnd();
       }
-      if (struct.addedToCommandLine != null) {
-        if (struct.isSetAddedToCommandLine()) {
-          oprot.writeFieldBegin(ADDED_TO_COMMAND_LINE_FIELD_DESC);
-          oprot.writeI32(struct.addedToCommandLine.getValue());
-          oprot.writeFieldEnd();
-        }
+      if (struct.isSetRequiredToAddedToCommandLine()) {
+        oprot.writeFieldBegin(REQUIRED_TO_ADDED_TO_COMMAND_LINE_FIELD_DESC);
+        oprot.writeBool(struct.requiredToAddedToCommandLine);
+        oprot.writeFieldEnd();
       }
       if (struct.isSetDataStaged()) {
         oprot.writeFieldBegin(DATA_STAGED_FIELD_DESC);
@@ -1364,10 +1326,10 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetInputOrder()) {
         optionals.set(6);
       }
-      if (struct.isSetInputValid()) {
+      if (struct.isSetIsRequired()) {
         optionals.set(7);
       }
-      if (struct.isSetAddedToCommandLine()) {
+      if (struct.isSetRequiredToAddedToCommandLine()) {
         optionals.set(8);
       }
       if (struct.isSetDataStaged()) {
@@ -1395,11 +1357,11 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetInputOrder()) {
         oprot.writeI32(struct.inputOrder);
       }
-      if (struct.isSetInputValid()) {
-        oprot.writeI32(struct.inputValid.getValue());
+      if (struct.isSetIsRequired()) {
+        oprot.writeBool(struct.isRequired);
       }
-      if (struct.isSetAddedToCommandLine()) {
-        oprot.writeI32(struct.addedToCommandLine.getValue());
+      if (struct.isSetRequiredToAddedToCommandLine()) {
+        oprot.writeBool(struct.requiredToAddedToCommandLine);
       }
       if (struct.isSetDataStaged()) {
         oprot.writeBool(struct.dataStaged);
@@ -1441,12 +1403,12 @@ import org.slf4j.LoggerFactory;
         struct.setInputOrderIsSet(true);
       }
       if (incoming.get(7)) {
-        struct.inputValid = ValidityType.findByValue(iprot.readI32());
-        struct.setInputValidIsSet(true);
+        struct.isRequired = iprot.readBool();
+        struct.setIsRequiredIsSet(true);
       }
       if (incoming.get(8)) {
-        struct.addedToCommandLine = CommandLineType.findByValue(iprot.readI32());
-        struct.setAddedToCommandLineIsSet(true);
+        struct.requiredToAddedToCommandLine = iprot.readBool();
+        struct.setRequiredToAddedToCommandLineIsSet(true);
       }
       if (incoming.get(9)) {
         struct.dataStaged = iprot.readBool();

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
index 4197c30..d432d09 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
@@ -81,8 +81,8 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField VALIDITY_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("validityType", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField ADDED_TO_COMMAND_LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("addedToCommandLine", org.apache.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.thrift.protocol.TField IS_REQUIRED_FIELD_DESC = new org.apache.thrift.protocol.TField("isRequired", org.apache.thrift.protocol.TType.BOOL, (short)4);
+  private static final org.apache.thrift.protocol.TField REQUIRED_TO_ADDED_TO_COMMAND_LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("requiredToAddedToCommandLine", org.apache.thrift.protocol.TType.BOOL, (short)5);
   private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovement", org.apache.thrift.protocol.TType.BOOL, (short)6);
   private static final org.apache.thrift.protocol.TField DATA_NAME_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("dataNameLocation", org.apache.thrift.protocol.TType.STRING, (short)7);
 
@@ -95,8 +95,8 @@ import org.slf4j.LoggerFactory;
   private String name; // required
   private String value; // optional
   private DataType type; // optional
-  private ValidityType validityType; // optional
-  private CommandLineType addedToCommandLine; // optional
+  private boolean isRequired; // optional
+  private boolean requiredToAddedToCommandLine; // optional
   private boolean dataMovement; // optional
   private String dataNameLocation; // optional
 
@@ -109,16 +109,8 @@ import org.slf4j.LoggerFactory;
      * @see DataType
      */
     TYPE((short)3, "type"),
-    /**
-     * 
-     * @see ValidityType
-     */
-    VALIDITY_TYPE((short)4, "validityType"),
-    /**
-     * 
-     * @see CommandLineType
-     */
-    ADDED_TO_COMMAND_LINE((short)5, "addedToCommandLine"),
+    IS_REQUIRED((short)4, "isRequired"),
+    REQUIRED_TO_ADDED_TO_COMMAND_LINE((short)5, "requiredToAddedToCommandLine"),
     DATA_MOVEMENT((short)6, "dataMovement"),
     DATA_NAME_LOCATION((short)7, "dataNameLocation");
 
@@ -141,10 +133,10 @@ import org.slf4j.LoggerFactory;
           return VALUE;
         case 3: // TYPE
           return TYPE;
-        case 4: // VALIDITY_TYPE
-          return VALIDITY_TYPE;
-        case 5: // ADDED_TO_COMMAND_LINE
-          return ADDED_TO_COMMAND_LINE;
+        case 4: // IS_REQUIRED
+          return IS_REQUIRED;
+        case 5: // REQUIRED_TO_ADDED_TO_COMMAND_LINE
+          return REQUIRED_TO_ADDED_TO_COMMAND_LINE;
         case 6: // DATA_MOVEMENT
           return DATA_MOVEMENT;
         case 7: // DATA_NAME_LOCATION
@@ -189,9 +181,11 @@ import org.slf4j.LoggerFactory;
   }
 
   // isset id assignments
-  private static final int __DATAMOVEMENT_ISSET_ID = 0;
+  private static final int __ISREQUIRED_ISSET_ID = 0;
+  private static final int __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID = 1;
+  private static final int __DATAMOVEMENT_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.VALIDITY_TYPE,_Fields.ADDED_TO_COMMAND_LINE,_Fields.DATA_MOVEMENT,_Fields.DATA_NAME_LOCATION};
+  private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_MOVEMENT,_Fields.DATA_NAME_LOCATION};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -201,10 +195,10 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataType.class)));
-    tmpMap.put(_Fields.VALIDITY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("validityType", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ValidityType.class)));
-    tmpMap.put(_Fields.ADDED_TO_COMMAND_LINE, new org.apache.thrift.meta_data.FieldMetaData("addedToCommandLine", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CommandLineType.class)));
+    tmpMap.put(_Fields.IS_REQUIRED, new org.apache.thrift.meta_data.FieldMetaData("isRequired", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE, new org.apache.thrift.meta_data.FieldMetaData("requiredToAddedToCommandLine", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("dataMovement", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.DATA_NAME_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("dataNameLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -237,12 +231,8 @@ import org.slf4j.LoggerFactory;
     if (other.isSetType()) {
       this.type = other.type;
     }
-    if (other.isSetValidityType()) {
-      this.validityType = other.validityType;
-    }
-    if (other.isSetAddedToCommandLine()) {
-      this.addedToCommandLine = other.addedToCommandLine;
-    }
+    this.isRequired = other.isRequired;
+    this.requiredToAddedToCommandLine = other.requiredToAddedToCommandLine;
     this.dataMovement = other.dataMovement;
     if (other.isSetDataNameLocation()) {
       this.dataNameLocation = other.dataNameLocation;
@@ -258,8 +248,10 @@ import org.slf4j.LoggerFactory;
     this.name = null;
     this.value = null;
     this.type = null;
-    this.validityType = null;
-    this.addedToCommandLine = null;
+    setIsRequiredIsSet(false);
+    this.isRequired = false;
+    setRequiredToAddedToCommandLineIsSet(false);
+    this.requiredToAddedToCommandLine = false;
     setDataMovementIsSet(false);
     this.dataMovement = false;
     this.dataNameLocation = null;
@@ -342,66 +334,48 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  /**
-   * 
-   * @see ValidityType
-   */
-  public ValidityType getValidityType() {
-    return this.validityType;
+  public boolean isIsRequired() {
+    return this.isRequired;
   }
 
-  /**
-   * 
-   * @see ValidityType
-   */
-  public void setValidityType(ValidityType validityType) {
-    this.validityType = validityType;
+  public void setIsRequired(boolean isRequired) {
+    this.isRequired = isRequired;
+    setIsRequiredIsSet(true);
   }
 
-  public void unsetValidityType() {
-    this.validityType = null;
+  public void unsetIsRequired() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
-  /** Returns true if field validityType is set (has been assigned a value) and false otherwise */
-  public boolean isSetValidityType() {
-    return this.validityType != null;
+  /** Returns true if field isRequired is set (has been assigned a value) and false otherwise */
+  public boolean isSetIsRequired() {
+    return EncodingUtils.testBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
-  public void setValidityTypeIsSet(boolean value) {
-    if (!value) {
-      this.validityType = null;
-    }
+  public void setIsRequiredIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISREQUIRED_ISSET_ID, value);
   }
 
-  /**
-   * 
-   * @see CommandLineType
-   */
-  public CommandLineType getAddedToCommandLine() {
-    return this.addedToCommandLine;
+  public boolean isRequiredToAddedToCommandLine() {
+    return this.requiredToAddedToCommandLine;
   }
 
-  /**
-   * 
-   * @see CommandLineType
-   */
-  public void setAddedToCommandLine(CommandLineType addedToCommandLine) {
-    this.addedToCommandLine = addedToCommandLine;
+  public void setRequiredToAddedToCommandLine(boolean requiredToAddedToCommandLine) {
+    this.requiredToAddedToCommandLine = requiredToAddedToCommandLine;
+    setRequiredToAddedToCommandLineIsSet(true);
   }
 
-  public void unsetAddedToCommandLine() {
-    this.addedToCommandLine = null;
+  public void unsetRequiredToAddedToCommandLine() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
-  /** Returns true if field addedToCommandLine is set (has been assigned a value) and false otherwise */
-  public boolean isSetAddedToCommandLine() {
-    return this.addedToCommandLine != null;
+  /** Returns true if field requiredToAddedToCommandLine is set (has been assigned a value) and false otherwise */
+  public boolean isSetRequiredToAddedToCommandLine() {
+    return EncodingUtils.testBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
-  public void setAddedToCommandLineIsSet(boolean value) {
-    if (!value) {
-      this.addedToCommandLine = null;
-    }
+  public void setRequiredToAddedToCommandLineIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID, value);
   }
 
   public boolean isDataMovement() {
@@ -475,19 +449,19 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case VALIDITY_TYPE:
+    case IS_REQUIRED:
       if (value == null) {
-        unsetValidityType();
+        unsetIsRequired();
       } else {
-        setValidityType((ValidityType)value);
+        setIsRequired((Boolean)value);
       }
       break;
 
-    case ADDED_TO_COMMAND_LINE:
+    case REQUIRED_TO_ADDED_TO_COMMAND_LINE:
       if (value == null) {
-        unsetAddedToCommandLine();
+        unsetRequiredToAddedToCommandLine();
       } else {
-        setAddedToCommandLine((CommandLineType)value);
+        setRequiredToAddedToCommandLine((Boolean)value);
       }
       break;
 
@@ -521,11 +495,11 @@ import org.slf4j.LoggerFactory;
     case TYPE:
       return getType();
 
-    case VALIDITY_TYPE:
-      return getValidityType();
+    case IS_REQUIRED:
+      return Boolean.valueOf(isIsRequired());
 
-    case ADDED_TO_COMMAND_LINE:
-      return getAddedToCommandLine();
+    case REQUIRED_TO_ADDED_TO_COMMAND_LINE:
+      return Boolean.valueOf(isRequiredToAddedToCommandLine());
 
     case DATA_MOVEMENT:
       return Boolean.valueOf(isDataMovement());
@@ -550,10 +524,10 @@ import org.slf4j.LoggerFactory;
       return isSetValue();
     case TYPE:
       return isSetType();
-    case VALIDITY_TYPE:
-      return isSetValidityType();
-    case ADDED_TO_COMMAND_LINE:
-      return isSetAddedToCommandLine();
+    case IS_REQUIRED:
+      return isSetIsRequired();
+    case REQUIRED_TO_ADDED_TO_COMMAND_LINE:
+      return isSetRequiredToAddedToCommandLine();
     case DATA_MOVEMENT:
       return isSetDataMovement();
     case DATA_NAME_LOCATION:
@@ -602,21 +576,21 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_validityType = true && this.isSetValidityType();
-    boolean that_present_validityType = true && that.isSetValidityType();
-    if (this_present_validityType || that_present_validityType) {
-      if (!(this_present_validityType && that_present_validityType))
+    boolean this_present_isRequired = true && this.isSetIsRequired();
+    boolean that_present_isRequired = true && that.isSetIsRequired();
+    if (this_present_isRequired || that_present_isRequired) {
+      if (!(this_present_isRequired && that_present_isRequired))
         return false;
-      if (!this.validityType.equals(that.validityType))
+      if (this.isRequired != that.isRequired)
         return false;
     }
 
-    boolean this_present_addedToCommandLine = true && this.isSetAddedToCommandLine();
-    boolean that_present_addedToCommandLine = true && that.isSetAddedToCommandLine();
-    if (this_present_addedToCommandLine || that_present_addedToCommandLine) {
-      if (!(this_present_addedToCommandLine && that_present_addedToCommandLine))
+    boolean this_present_requiredToAddedToCommandLine = true && this.isSetRequiredToAddedToCommandLine();
+    boolean that_present_requiredToAddedToCommandLine = true && that.isSetRequiredToAddedToCommandLine();
+    if (this_present_requiredToAddedToCommandLine || that_present_requiredToAddedToCommandLine) {
+      if (!(this_present_requiredToAddedToCommandLine && that_present_requiredToAddedToCommandLine))
         return false;
-      if (!this.addedToCommandLine.equals(that.addedToCommandLine))
+      if (this.requiredToAddedToCommandLine != that.requiredToAddedToCommandLine)
         return false;
     }
 
@@ -684,22 +658,22 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValidityType()).compareTo(other.isSetValidityType());
+    lastComparison = Boolean.valueOf(isSetIsRequired()).compareTo(other.isSetIsRequired());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetValidityType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validityType, other.validityType);
+    if (isSetIsRequired()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isRequired, other.isRequired);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAddedToCommandLine()).compareTo(other.isSetAddedToCommandLine());
+    lastComparison = Boolean.valueOf(isSetRequiredToAddedToCommandLine()).compareTo(other.isSetRequiredToAddedToCommandLine());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetAddedToCommandLine()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.addedToCommandLine, other.addedToCommandLine);
+    if (isSetRequiredToAddedToCommandLine()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requiredToAddedToCommandLine, other.requiredToAddedToCommandLine);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -771,24 +745,16 @@ import org.slf4j.LoggerFactory;
       }
       first = false;
     }
-    if (isSetValidityType()) {
+    if (isSetIsRequired()) {
       if (!first) sb.append(", ");
-      sb.append("validityType:");
-      if (this.validityType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.validityType);
-      }
+      sb.append("isRequired:");
+      sb.append(this.isRequired);
       first = false;
     }
-    if (isSetAddedToCommandLine()) {
+    if (isSetRequiredToAddedToCommandLine()) {
       if (!first) sb.append(", ");
-      sb.append("addedToCommandLine:");
-      if (this.addedToCommandLine == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.addedToCommandLine);
-      }
+      sb.append("requiredToAddedToCommandLine:");
+      sb.append(this.requiredToAddedToCommandLine);
       first = false;
     }
     if (isSetDataMovement()) {
@@ -880,18 +846,18 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // VALIDITY_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.validityType = ValidityType.findByValue(iprot.readI32());
-              struct.setValidityTypeIsSet(true);
+          case 4: // IS_REQUIRED
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.isRequired = iprot.readBool();
+              struct.setIsRequiredIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 5: // ADDED_TO_COMMAND_LINE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.addedToCommandLine = CommandLineType.findByValue(iprot.readI32());
-              struct.setAddedToCommandLineIsSet(true);
+          case 5: // REQUIRED_TO_ADDED_TO_COMMAND_LINE
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.requiredToAddedToCommandLine = iprot.readBool();
+              struct.setRequiredToAddedToCommandLineIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -944,19 +910,15 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldEnd();
         }
       }
-      if (struct.validityType != null) {
-        if (struct.isSetValidityType()) {
-          oprot.writeFieldBegin(VALIDITY_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.validityType.getValue());
-          oprot.writeFieldEnd();
-        }
+      if (struct.isSetIsRequired()) {
+        oprot.writeFieldBegin(IS_REQUIRED_FIELD_DESC);
+        oprot.writeBool(struct.isRequired);
+        oprot.writeFieldEnd();
       }
-      if (struct.addedToCommandLine != null) {
-        if (struct.isSetAddedToCommandLine()) {
-          oprot.writeFieldBegin(ADDED_TO_COMMAND_LINE_FIELD_DESC);
-          oprot.writeI32(struct.addedToCommandLine.getValue());
-          oprot.writeFieldEnd();
-        }
+      if (struct.isSetRequiredToAddedToCommandLine()) {
+        oprot.writeFieldBegin(REQUIRED_TO_ADDED_TO_COMMAND_LINE_FIELD_DESC);
+        oprot.writeBool(struct.requiredToAddedToCommandLine);
+        oprot.writeFieldEnd();
       }
       if (struct.isSetDataMovement()) {
         oprot.writeFieldBegin(DATA_MOVEMENT_FIELD_DESC);
@@ -995,10 +957,10 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetType()) {
         optionals.set(1);
       }
-      if (struct.isSetValidityType()) {
+      if (struct.isSetIsRequired()) {
         optionals.set(2);
       }
-      if (struct.isSetAddedToCommandLine()) {
+      if (struct.isSetRequiredToAddedToCommandLine()) {
         optionals.set(3);
       }
       if (struct.isSetDataMovement()) {
@@ -1014,11 +976,11 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetType()) {
         oprot.writeI32(struct.type.getValue());
       }
-      if (struct.isSetValidityType()) {
-        oprot.writeI32(struct.validityType.getValue());
+      if (struct.isSetIsRequired()) {
+        oprot.writeBool(struct.isRequired);
       }
-      if (struct.isSetAddedToCommandLine()) {
-        oprot.writeI32(struct.addedToCommandLine.getValue());
+      if (struct.isSetRequiredToAddedToCommandLine()) {
+        oprot.writeBool(struct.requiredToAddedToCommandLine);
       }
       if (struct.isSetDataMovement()) {
         oprot.writeBool(struct.dataMovement);
@@ -1043,12 +1005,12 @@ import org.slf4j.LoggerFactory;
         struct.setTypeIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.validityType = ValidityType.findByValue(iprot.readI32());
-        struct.setValidityTypeIsSet(true);
+        struct.isRequired = iprot.readBool();
+        struct.setIsRequiredIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.addedToCommandLine = CommandLineType.findByValue(iprot.readI32());
-        struct.setAddedToCommandLineIsSet(true);
+        struct.requiredToAddedToCommandLine = iprot.readBool();
+        struct.setRequiredToAddedToCommandLineIsSet(true);
       }
       if (incoming.get(4)) {
         struct.dataMovement = iprot.readBool();

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ValidityType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ValidityType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ValidityType.java
deleted file mode 100644
index e40f200..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ValidityType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.appinterface;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-@SuppressWarnings("all") public enum ValidityType implements org.apache.thrift.TEnum {
-  REQUIRED(0),
-  OPTIONAL(1);
-
-  private final int value;
-
-  private ValidityType(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static ValidityType findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return REQUIRED;
-      case 1:
-        return OPTIONAL;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
index d724b5b..386dba2 100644
--- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
@@ -43,16 +43,6 @@ enum DataType{
 	STDERR
 }
 
-enum ValidityType{
-	REQUIRED,
-	OPTIONAL
-}
-
-enum CommandLineType{
-	IMPLICIT,
-	EXPLICIT
-}
-
 /**
  * Application Inputs. The paramters describe how inputs are passed to the application.
  *
@@ -88,8 +78,8 @@ struct InputDataObjectType {
     6: optional string userFriendlyDescription,
     7: optional string metaData,
     8: optional i32 inputOrder,
-    9: optional ValidityType inputValid,
-    10: optional CommandLineType addedToCommandLine,
+    9: optional bool isRequired,
+    10: optional bool requiredToAddedToCommandLine,
     11: optional bool dataStaged = 0
 }
 
@@ -123,8 +113,8 @@ struct OutputDataObjectType {
     1: required string name,
     2: optional string value,
     3: optional DataType type,
-    4: optional ValidityType validityType,
-    5: optional CommandLineType addedToCommandLine,
+    4: optional bool isRequired,
+    5: optional bool requiredToAddedToCommandLine,
     6: optional bool dataMovement,
     7: optional string dataNameLocation
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
index c5bd9c6..850e18c 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
@@ -104,31 +104,23 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
                     inputResource.setStandardInput(input.isStandardInput());
                     inputResource.setAppArgument(input.getApplicationArgument());
                     inputResource.setInputOrder(input.getInputOrder());
-                    if (input.getInputValid() != null){
-                        inputResource.setValidityType(input.getInputValid().toString());
-                    }
-                    if (input.getAddedToCommandLine() != null){
-                        inputResource.setCommandLineType(input.getAddedToCommandLine().toString());
-                    }
+                    inputResource.setRequired(input.isIsRequired());
+                    inputResource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                     inputResource.save();
                 }
             }
 
             List<OutputDataObjectType> applicationOutputs = applicationInterfaceDescription.getApplicationOutputs();
-            if (applicationOutputs != null && !applicationOutputs.isEmpty()){
-                for (OutputDataObjectType output : applicationOutputs){
+            if (applicationOutputs != null && !applicationOutputs.isEmpty()) {
+                for (OutputDataObjectType output : applicationOutputs) {
                     ApplicationOutputResource outputResource = new ApplicationOutputResource();
                     outputResource.setInterfaceID(resource.getInterfaceId());
                     outputResource.setAppInterfaceResource(resource);
                     outputResource.setOutputKey(output.getName());
                     outputResource.setOutputVal(output.getValue());
                     outputResource.setDataType(output.getType().toString());
-                    if (output.getValidityType() != null){
-                        outputResource.setValidityType(output.getValidityType().toString());
-                    }
-                    if (output.getAddedToCommandLine() != null){
-                        outputResource.setCommandLineType(output.getAddedToCommandLine().toString());
-                    }
+                    outputResource.setRequired(output.isIsRequired());
+                    outputResource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                     outputResource.setDataMovement(output.isDataMovement());
                     outputResource.setDataNameLocation(output.getDataNameLocation());
                     outputResource.save();
@@ -234,12 +226,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
                     inputResource.setStandardInput(input.isStandardInput());
                     inputResource.setAppArgument(input.getApplicationArgument());
                     inputResource.setInputOrder(input.getInputOrder());
-                    if (input.getInputValid() != null){
-                        inputResource.setValidityType(input.getInputValid().toString());
-                    }
-                    if (input.getAddedToCommandLine() != null){
-                        inputResource.setCommandLineType(input.getAddedToCommandLine().toString());
-                    }
+                    inputResource.setRequired(input.isIsRequired());
+                    inputResource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
                     inputResource.save();
                 }
             }
@@ -264,12 +252,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
                     outputResource.setOutputKey(output.getName());
                     outputResource.setOutputVal(output.getValue());
                     outputResource.setDataType(output.getType().toString());
-                    if (output.getValidityType() != null){
-                        outputResource.setValidityType(output.getValidityType().toString());
-                    }
-                    if (output.getAddedToCommandLine() != null){
-                        outputResource.setCommandLineType(output.getAddedToCommandLine().toString());
-                    }
+                    outputResource.setRequired(output.isIsRequired());
+                    outputResource.setRequiredToCMD(output.isRequiredToAddedToCommandLine());
                     outputResource.setDataMovement(output.isDataMovement());
                     outputResource.setDataNameLocation(output.getDataNameLocation());
                     outputResource.save();

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
index e7b98c2..5255bc0 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
@@ -49,10 +49,10 @@ public class ApplicationInput implements Serializable {
     private boolean standardInput;
     @Column(name="INPUT_ORDER")
     private int inputOrder;
-    @Column(name="VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name="IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_STAGED")
     private boolean dataStaged;
 
@@ -140,20 +140,20 @@ public class ApplicationInput implements Serializable {
         this.inputOrder = inputOrder;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
index 861698d..2115d92 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
@@ -39,10 +39,10 @@ public class ApplicationOutput implements Serializable {
     private String outputVal;
     @Column(name = "DATA_TYPE")
     private String dataType;
-    @Column(name = "VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name = "IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_MOVEMENT")
     private boolean dataMovement;
     @Column(name = "DATA_NAME_LOCATION")
@@ -52,13 +52,6 @@ public class ApplicationOutput implements Serializable {
     @JoinColumn(name = "INTERFACE_ID")
     private ApplicationInterface applicationInterface;
 
-    public String getCommandLineType() {
-        return commandLineType;
-    }
-
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
-    }
     public String getInterfaceID() {
         return interfaceID;
     }
@@ -99,12 +92,20 @@ public class ApplicationOutput implements Serializable {
         this.outputVal = outputVal;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
+    }
+
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
+    }
+
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataMovement() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
index 8318bee..7ec659f 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
@@ -50,10 +50,10 @@ public class WorkflowInput implements Serializable {
     private boolean standardInput;
     @Column(name = "INPUT_ORDER")
     private int inputOrder;
-    @Column(name="VALIDITY_TYPE")
-    private String validityType;
-    @Column(name="COMMANDLINE_TYPE")
-    private String commandLineType;
+    @Column(name="IS_REQUIRED")
+    private boolean isRequired;
+    @Column(name="REQUIRED_TO_COMMANDLINE")
+    private boolean requiredToCMD;
     @Column(name = "DATA_STAGED")
     private boolean dataStaged;
 
@@ -141,20 +141,20 @@ public class WorkflowInput implements Serializable {
         this.inputOrder = inputOrder;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean isRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean isRequired) {
+        this.isRequired = isRequired;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean isRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
index 87e1246..3dcb6b4 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
@@ -50,8 +50,8 @@ public class ApplicationInputResource extends AbstractResource {
     private String userFriendlyDesc;
     private int inputOrder;
     private boolean standardInput;
-    private String validityType;
-    private String commandLineType;
+    private boolean isRequired;
+    private boolean requiredToCMD;
     private boolean dataStaged;
 
     private AppInterfaceResource appInterfaceResource;
@@ -294,8 +294,8 @@ public class ApplicationInputResource extends AbstractResource {
             applicationInput.setUserFriendlyDesc(userFriendlyDesc);
             applicationInput.setStandardInput(standardInput);
             applicationInput.setInputOrder(inputOrder);
-            applicationInput.setCommandLineType(commandLineType);
-            applicationInput.setValidityType(validityType);
+            applicationInput.setRequiredToCMD(requiredToCMD);
+            applicationInput.setRequired(isRequired);
             applicationInput.setDataStaged(dataStaged);
             if (existingApplicationInput == null) {
                 em.persist(applicationInput);
@@ -428,20 +428,20 @@ public class ApplicationInputResource extends AbstractResource {
         this.inputOrder = inputOrder;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
index f61f124..2a93354 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
@@ -44,10 +44,10 @@ public class ApplicationOutputResource extends AbstractResource {
     private String outputKey;
     private String outputVal;
     private String dataType;
-    private String validityType;
+    private boolean isRequired;
     private boolean dataMovement;
     private String dataNameLocation;
-    private String commandLineType;
+    private boolean requiredToCMD;
 
     private AppInterfaceResource appInterfaceResource;
 
@@ -287,8 +287,8 @@ public class ApplicationOutputResource extends AbstractResource {
             applicationOutput.setDataType(dataType);
             applicationOutput.setOutputKey(outputKey);
             applicationOutput.setOutputVal(outputVal);
-            applicationOutput.setValidityType(validityType);
-            applicationOutput.setCommandLineType(commandLineType);
+            applicationOutput.setRequired(isRequired);
+            applicationOutput.setRequiredToCMD(requiredToCMD);
             applicationOutput.setDataMovement(dataMovement);
             applicationOutput.setDataNameLocation(dataNameLocation);
             em.merge(applicationOutput);
@@ -378,12 +378,12 @@ public class ApplicationOutputResource extends AbstractResource {
         this.appInterfaceResource = appInterfaceResource;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
     public boolean isDataMovement() {
@@ -402,11 +402,11 @@ public class ApplicationOutputResource extends AbstractResource {
         this.dataNameLocation = dataNameLocation;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
index c00d48c..ac22744 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
@@ -50,8 +50,8 @@ public class WorkflowInputResource extends AbstractResource {
     private String userFriendlyDesc;
     private boolean standardInput;
     private int inputOrder;
-    private String validityType;
-    private String commandLineType;
+    private boolean isRequired;
+    private boolean requiredToCMD;
     private boolean dataStaged;
 
     private WorkflowResource workflowResource;
@@ -291,8 +291,8 @@ public class WorkflowInputResource extends AbstractResource {
             workflowInput.setAppArgument(appArgument);
             workflowInput.setUserFriendlyDesc(userFriendlyDesc);
             workflowInput.setStandardInput(standardInput);
-            workflowInput.setCommandLineType(commandLineType);
-            workflowInput.setValidityType(validityType);
+            workflowInput.setRequiredToCMD(requiredToCMD);
+            workflowInput.setRequired(isRequired);
             workflowInput.setDataStaged(dataStaged);
             if (existingWFInput == null) {
                 em.persist(workflowInput);
@@ -425,20 +425,20 @@ public class WorkflowInputResource extends AbstractResource {
         this.inputOrder = inputOrder;
     }
 
-    public String getValidityType() {
-        return validityType;
+    public boolean getRequired() {
+        return isRequired;
     }
 
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
+    public void setRequired(boolean required) {
+        this.isRequired = required;
     }
 
-    public String getCommandLineType() {
-        return commandLineType;
+    public boolean getRequiredToCMD() {
+        return requiredToCMD;
     }
 
-    public void setCommandLineType(String commandLineType) {
-        this.commandLineType = commandLineType;
+    public void setRequiredToCMD(boolean requiredToCMD) {
+        this.requiredToCMD = requiredToCMD;
     }
 
     public boolean isDataStaged() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
index 0dbf54c..e60e0d7 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
@@ -764,8 +764,8 @@ public class AppCatalogJPAUtils {
             resource.setUserFriendlyDesc(o.getUserFriendlyDesc());
             resource.setStandardInput(o.isStandardInput());
             resource.setInputOrder(o.getInputOrder());
-            resource.setValidityType(o.getValidityType());
-            resource.setCommandLineType(o.getCommandLineType());
+            resource.setRequired(o.isRequired());
+            resource.setRequiredToCMD(o.isRequiredToCMD());
             resource.setDataStaged(o.isDataStaged());
             resource.setAppInterfaceResource((AppInterfaceResource)createAppInterfaceResource(o.getApplicationInterface()));
         }
@@ -786,8 +786,8 @@ public class AppCatalogJPAUtils {
             resource.setInputOrder(o.getInputOrder());
             resource.setUserFriendlyDesc(o.getUserFriendlyDesc());
             resource.setStandardInput(o.isStandardInput());
-            resource.setValidityType(o.getValidityType());
-            resource.setCommandLineType(o.getCommandLineType());
+            resource.setRequired(o.isRequired());
+            resource.setRequiredToCMD(o.isRequiredToCMD());
             resource.setDataStaged(o.isDataStaged());
             resource.setWorkflowResource((WorkflowResource)createWorkflow(o.getWorkflow()));
         }
@@ -801,8 +801,8 @@ public class AppCatalogJPAUtils {
             resource.setOutputKey(o.getOutputKey());
             resource.setOutputVal(o.getOutputVal());
             resource.setDataType(o.getDataType());
-            resource.setValidityType(o.getValidityType());
-            resource.setCommandLineType(o.getCommandLineType());
+            resource.setRequired(o.isRequired());
+            resource.setRequiredToCMD(o.isRequiredToCMD());
             resource.setDataMovement(o.isDataMovement());
             resource.setDataNameLocation(o.getDataNameLocation());
             resource.setAppInterfaceResource((AppInterfaceResource)createAppInterfaceResource(o.getApplicationInterface()));

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index eaa9eae..87083a9 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -22,8 +22,6 @@
 package org.apache.aiaravata.application.catalog.data.util;
 
 import org.airavata.appcatalog.cpi.AppCatalogException;
-import org.apache.aiaravata.application.catalog.data.model.PostJobCommand;
-import org.apache.aiaravata.application.catalog.data.model.PreJobCommand;
 import org.apache.aiaravata.application.catalog.data.resources.*;
 import org.apache.airavata.model.Workflow;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
@@ -564,12 +562,8 @@ public class AppCatalogThriftConversion {
         inputDataObjectType.setType(DataType.valueOf(input.getDataType()));
         inputDataObjectType.setStandardInput(input.isStandardInput());
         inputDataObjectType.setUserFriendlyDescription(input.getUserFriendlyDesc());
-        if (input.getValidityType() != null){
-            inputDataObjectType.setInputValid(ValidityType.valueOf(input.getValidityType()));
-        }
-        if (input.getCommandLineType() != null){
-            inputDataObjectType.setAddedToCommandLine(CommandLineType.valueOf(input.getCommandLineType()));
-        }
+        inputDataObjectType.setIsRequired(input.getRequired());
+        inputDataObjectType.setRequiredToAddedToCommandLine(input.getRequiredToCMD());
         inputDataObjectType.setDataStaged(input.isDataStaged());
         return inputDataObjectType;
     }
@@ -586,12 +580,8 @@ public class AppCatalogThriftConversion {
         outputDataObjectType.setName(output.getOutputKey());
         outputDataObjectType.setValue(output.getOutputVal());
         outputDataObjectType.setType(DataType.valueOf(output.getDataType()));
-        if (output.getValidityType() != null){
-            outputDataObjectType.setValidityType(ValidityType.valueOf(output.getValidityType()));
-        }
-        if (output.getCommandLineType() != null){
-            outputDataObjectType.setAddedToCommandLine(CommandLineType.valueOf(output.getCommandLineType()));
-        }
+        outputDataObjectType.setIsRequired(output.getRequired());
+        outputDataObjectType.setRequiredToAddedToCommandLine(output.getRequiredToCMD());
         outputDataObjectType.setDataMovement(output.isDataMovement());
         outputDataObjectType.setDataNameLocation(output.getDataNameLocation());
         return outputDataObjectType;
@@ -733,12 +723,8 @@ public class AppCatalogThriftConversion {
         input.setType(DataType.valueOf(resource.getDataType()));
         input.setMetaData(resource.getMetadata());
         input.setUserFriendlyDescription(resource.getUserFriendlyDesc());
-        if (resource.getValidityType() != null){
-            input.setInputValid(ValidityType.valueOf(resource.getValidityType()));
-        }
-        if (resource.getCommandLineType() != null){
-            input.setAddedToCommandLine(CommandLineType.valueOf(resource.getCommandLineType()));
-        }
+        input.setIsRequired(resource.getRequired());
+        input.setRequiredToAddedToCommandLine(resource.getRequiredToCMD());
         input.setDataStaged(resource.isDataStaged());
         return input;
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
index 34fa021..0bba153 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
@@ -274,8 +274,8 @@ CREATE TABLE APPLICATION_INPUT
          APP_ARGUMENT VARCHAR(255),
          STANDARD_INPUT SMALLINT,
          INPUT_ORDER INTEGER,
-         VALIDITY_TYPE VARCHAR(255),
-         COMMANDLINE_TYPE VARCHAR(255),
+         IS_REQUIRED SMALLINT,
+         REQUIRED_TO_COMMANDLINE SMALLINT,
          DATA_STAGED SMALLINT,
          USER_FRIENDLY_DESC VARCHAR(255),
          PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
@@ -288,8 +288,8 @@ CREATE TABLE APPLICATION_OUTPUT
          OUTPUT_KEY VARCHAR(255),
          OUTPUT_VALUE VARCHAR(255),
          DATA_TYPE VARCHAR(255),
-         VALIDITY_TYPE VARCHAR(255),
-         COMMANDLINE_TYPE VARCHAR(255),
+         IS_REQUIRED SMALLINT,
+         REQUIRED_TO_COMMANDLINE SMALLINT,
          DATA_MOVEMENT SMALLINT,
          DATA_NAME_LOCATION VARCHAR(255),
          PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
index 7cea574..e2893d3 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
@@ -274,8 +274,8 @@ CREATE TABLE APPLICATION_INPUT
          STANDARD_INPUT SMALLINT,
          USER_FRIENDLY_DESC VARCHAR(255),
          INPUT_ORDER INTEGER,
-         VALIDITY_TYPE VARCHAR(255),
-         COMMANDLINE_TYPE VARCHAR(255),
+         IS_REQUIRED SMALLINT,
+         REQUIRED_TO_COMMANDLINE SMALLINT,
          DATA_STAGED SMALLINT,
          PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
          FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
@@ -287,8 +287,8 @@ CREATE TABLE APPLICATION_OUTPUT
          OUTPUT_KEY VARCHAR(255),
          OUTPUT_VALUE VARCHAR(255),
          DATA_TYPE VARCHAR(255),
-         VALIDITY_TYPE VARCHAR(255),
-         COMMANDLINE_TYPE VARCHAR(255),
+         IS_REQUIRED SMALLINT,
+         REQUIRED_TO_COMMANDLINE SMALLINT,
          DATA_MOVEMENT SMALLINT,
          DATA_NAME_LOCATION VARCHAR(255),
          PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
index 34fa021..0bba153 100644
--- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
@@ -274,8 +274,8 @@ CREATE TABLE APPLICATION_INPUT
          APP_ARGUMENT VARCHAR(255),
          STANDARD_INPUT SMALLINT,
          INPUT_ORDER INTEGER,
-         VALIDITY_TYPE VARCHAR(255),
-         COMMANDLINE_TYPE VARCHAR(255),
+         IS_REQUIRED SMALLINT,
+         REQUIRED_TO_COMMANDLINE SMALLINT,
          DATA_STAGED SMALLINT,
          USER_FRIENDLY_DESC VARCHAR(255),
          PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
@@ -288,8 +288,8 @@ CREATE TABLE APPLICATION_OUTPUT
          OUTPUT_KEY VARCHAR(255),
          OUTPUT_VALUE VARCHAR(255),
          DATA_TYPE VARCHAR(255),
-         VALIDITY_TYPE VARCHAR(255),
-         COMMANDLINE_TYPE VARCHAR(255),
+         IS_REQUIRED SMALLINT,
+         REQUIRED_TO_COMMANDLINE SMALLINT,
          DATA_MOVEMENT SMALLINT,
          DATA_NAME_LOCATION VARCHAR(255),
          PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 006319c..7aea965 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -381,7 +381,7 @@ public class BetterGfacImpl implements GFac,Watcher {
         }
 
         for (OutputDataObjectType objectType : taskOutputs){
-            if (objectType.getAddedToCommandLine() != null && objectType.getAddedToCommandLine()== CommandLineType.EXPLICIT){
+            if (objectType.isRequiredToAddedToCommandLine()){
               objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + objectType.getName());
             }
             if (objectType.getType() == DataType.STDOUT){

http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
index 1bc0683..cdcc0ec 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
@@ -40,7 +40,6 @@ import org.apache.airavata.gsi.ssh.impl.GSISSHAbstractCluster;
 import org.apache.airavata.gsi.ssh.impl.PBSCluster;
 import org.apache.airavata.gsi.ssh.util.CommonUtils;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appinterface.CommandLineType;
 import org.apache.airavata.model.appcatalog.appinterface.DataType;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
@@ -215,8 +214,7 @@ public class GFACGSISSHUtils {
             }
         }
         for (InputDataObjectType inputDataObjectType : sortedInputSet) {
-            if (inputDataObjectType.getAddedToCommandLine() != null
-                    && inputDataObjectType.getAddedToCommandLine() == CommandLineType.IMPLICIT) {
+            if (!inputDataObjectType.isRequiredToAddedToCommandLine()) {
                 continue;
             }
             if (inputDataObjectType.getApplicationArgument() != null
@@ -242,8 +240,7 @@ public class GFACGSISSHUtils {
         for (Object outputParam : outputParams.values()) {
             if (outputParam instanceof OutputDataObjectType) {
                 OutputDataObjectType output = (OutputDataObjectType) outputParam;
-                if (output.getValue() != null && !output.getValue().equals("") && output.getAddedToCommandLine() != null
-                        && output.getAddedToCommandLine() == CommandLineType.EXPLICIT) {
+                if (output.getValue() != null && !output.getValue().equals("") && output.isRequiredToAddedToCommandLine()) {
                     inputValues.add(output.getValue());
                 }
             }