airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [4/4] airavata git commit: changing validity type and addedToCMD to boolean
Date Mon, 12 Jan 2015 21:40:20 GMT
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 <kamalasini@gmail.com>
Authored: Mon Jan 12 16:40:08 2015 -0500
Committer: Chathuri Wimalasena <kamalasini@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;
     }
 


Mime
View raw message