Revert "Revert "Merge branch 'master' of"", Reverting msmemon's merge commits and revert commit of that merge commit
This reverts commit 5a1b225fd4cb0e40953f63e5a0d100a55160d9c3. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/63a561c3 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/63a561c3 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/63a561c3 Branch: refs/heads/master Commit: 63a561c388655c2542e468eb627166dd5b255ec8 Parents: 5a1b225 Author: shamrath <[email protected]> Authored: Thu Dec 11 14:15:25 2014 -0500 Committer: shamrath <[email protected]> Committed: Thu Dec 11 14:15:25 2014 -0500 ---------------------------------------------------------------------- .../applicationInterfaceModel_types.cpp | 212 ++++++++-- .../airavata/applicationInterfaceModel_types.h | 124 +++++- .../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 | 167 ++++++++ .../client/samples/RegisterSampleData.java | 14 +- .../tools/RegisterOGCEUS3Application.java | 2 +- .../tools/RegisterSampleApplications.java | 85 ++-- .../tools/RegisterSampleApplicationsUtils.java | 3 +- .../client/tools/RegisterUS3Application.java | 2 +- .../appinterface/InputDataObjectType.java | 424 ++++++++++++++++++- .../appinterface/OutputDataObjectType.java | 320 +++++++++++++- .../airavata/model/util/AppInterfaceUtil.java | 2 + .../applicationInterfaceModel.thrift | 29 +- .../data/impl/ApplicationInterfaceImpl.java | 6 +- .../catalog/data/impl/WorkflowCatalogImpl.java | 4 +- .../catalog/data/model/ApplicationInput.java | 40 ++ .../catalog/data/model/ApplicationOutput.java | 30 ++ .../catalog/data/model/WorkflowInput.java | 44 +- .../catalog/data/model/WorkflowOutput.java | 30 ++ .../resources/ApplicationInputResource.java | 52 ++- .../resources/ApplicationOutputResource.java | 30 ++ .../data/resources/WorkflowInputResource.java | 51 ++- .../data/resources/WorkflowOutputResource.java | 33 ++ .../catalog/data/util/AppCatalogJPAUtils.java | 18 +- .../data/util/AppCatalogThriftConversion.java | 28 +- .../src/main/resources/appcatalog-derby.sql | 7 + .../src/main/resources/appcatalog-mysql.sql | 7 + .../app/catalog/test/AppInterfaceTest.java | 2 + .../src/test/resources/appcatalog-derby.sql | 7 + .../gfac/local/provider/impl/LocalProvider.java | 41 +- .../registry/jpa/impl/ExperimentRegistry.java | 38 +- .../registry/jpa/model/ApplicationInput.java | 86 +++- .../registry/jpa/model/ApplicationOutput.java | 53 ++- .../registry/jpa/model/Experiment_Input.java | 87 +++- .../registry/jpa/model/Experiment_Output.java | 53 ++- .../registry/jpa/model/NodeInput.java | 85 +++- .../registry/jpa/model/NodeOutput.java | 53 ++- .../jpa/resources/ApplicationInputResource.java | 91 +++- .../resources/ApplicationOutputResource.java | 58 ++- .../jpa/resources/ExperimentInputResource.java | 92 +++- .../jpa/resources/ExperimentOutputResource.java | 58 ++- .../jpa/resources/NodeInputResource.java | 92 +++- .../jpa/resources/NodeOutputResource.java | 58 ++- .../registry/jpa/resources/Utils.java | 46 +- .../jpa/utils/ThriftDataModelConversion.java | 79 +++- .../src/main/resources/registry-derby.sql | 45 +- .../src/main/resources/registry-mysql.sql | 45 +- .../jpa/ExperimentInputResourceTest.java | 2 +- .../jpa/ExperimentOutputResourceTest.java | 2 +- .../src/test/resources/registry-derby.sql | 45 +- .../engine/interpretor/WorkflowInterpreter.java | 14 +- .../model/component/ws/WSComponent.java | 3 +- .../component/ws/WSComponentApplication.java | 97 +++-- .../ws/WSComponentApplicationParameter.java | 39 +- .../model/component/ws/WSComponentPort.java | 23 +- .../workflow/model/gpel/script/BPELScript.java | 2 +- .../model/gpel/script/WorkflowWSDL.java | 3 +- .../workflow/model/graph/GraphSchema.java | 1 + .../workflow/model/graph/system/InputNode.java | 23 +- .../workflow/model/utils/WorkflowConstants.java | 16 +- .../registry/ComponentRegistryLoader.java | 9 +- .../graph/system/InputConfigurationDialog.java | 91 ++-- .../WorkflowInterpreterLaunchWindow.java | 3 + 68 files changed, 2860 insertions(+), 486 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 4a064b0..1b40aa0 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,8 +45,38 @@ 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)); -const char* InputDataObjectType::ascii_fingerprint = "24F962C1CE4BE9FBD0F5D5EE9D1D5C00"; -const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x24,0xF9,0x62,0xC1,0xCE,0x4B,0xE9,0xFB,0xD0,0xF5,0xD5,0xEE,0x9D,0x1D,0x5C,0x00}; +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::INCLUSIVE, + CommandLineType::EXCLUSIVE +}; +const char* _kCommandLineTypeNames[] = { + "INCLUSIVE", + "EXCLUSIVE" +}; +const std::map<int, const char*> _CommandLineType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kCommandLineTypeValues, _kCommandLineTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); + +int _kInputMetadataTypeValues[] = { + InputMetadataType::MEMORY, + InputMetadataType::CPU +}; +const char* _kInputMetadataTypeNames[] = { + "MEMORY", + "CPU" +}; +const std::map<int, const char*> _InputMetadataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kInputMetadataTypeValues, _kInputMetadataTypeNames), ::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}; uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -127,6 +157,42 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; + case 8: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->inputOrder); + this->__isset.inputOrder = true; + } else { + xfer += iprot->skip(ftype); + } + 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; + } 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; + } else { + xfer += iprot->skip(ftype); + } + break; + case 11: + if (ftype == ::apache::thrift::protocol::T_BOOL) { + xfer += iprot->readBool(this->dataStaged); + this->__isset.dataStaged = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -179,6 +245,26 @@ uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* oprot xfer += oprot->writeString(this->metaData); xfer += oprot->writeFieldEnd(); } + if (this->__isset.inputOrder) { + xfer += oprot->writeFieldBegin("inputOrder", ::apache::thrift::protocol::T_I32, 8); + 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); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.addedToCommandLine) { + xfer += oprot->writeFieldBegin("addedToCommandLine", ::apache::thrift::protocol::T_I32, 10); + xfer += oprot->writeI32((int32_t)this->addedToCommandLine); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.dataStaged) { + xfer += oprot->writeFieldBegin("dataStaged", ::apache::thrift::protocol::T_BOOL, 11); + xfer += oprot->writeBool(this->dataStaged); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -193,11 +279,15 @@ void swap(InputDataObjectType &a, InputDataObjectType &b) { swap(a.standardInput, b.standardInput); 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.dataStaged, b.dataStaged); swap(a.__isset, b.__isset); } -const char* OutputDataObjectType::ascii_fingerprint = "B33AE596EF78C48424CF96BCA5D1DF99"; -const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0xB3,0x3A,0xE5,0x96,0xEF,0x78,0xC4,0x84,0x24,0xCF,0x96,0xBC,0xA5,0xD1,0xDF,0x99}; +const char* OutputDataObjectType::ascii_fingerprint = "9B8C3AEA43A2028DF0CEF51E90706E3A"; +const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0x9B,0x8C,0x3A,0xEA,0x43,0xA2,0x02,0x8D,0xF0,0xCE,0xF5,0x1E,0x90,0x70,0x6E,0x3A}; uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -238,14 +328,40 @@ uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot break; case 3: if (ftype == ::apache::thrift::protocol::T_I32) { - int32_t ecast1; - xfer += iprot->readI32(ecast1); - this->type = (DataType::type)ecast1; + int32_t ecast3; + xfer += iprot->readI32(ecast3); + this->type = (DataType::type)ecast3; 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; + } else { + xfer += iprot->skip(ftype); + } + break; + case 5: + if (ftype == ::apache::thrift::protocol::T_BOOL) { + xfer += iprot->readBool(this->dataMovement); + this->__isset.dataMovement = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 6: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->dataNameLocation); + this->__isset.dataNameLocation = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -278,6 +394,21 @@ 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); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.dataMovement) { + xfer += oprot->writeFieldBegin("dataMovement", ::apache::thrift::protocol::T_BOOL, 5); + xfer += oprot->writeBool(this->dataMovement); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.dataNameLocation) { + xfer += oprot->writeFieldBegin("dataNameLocation", ::apache::thrift::protocol::T_STRING, 6); + xfer += oprot->writeString(this->dataNameLocation); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -288,11 +419,14 @@ 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.dataMovement, b.dataMovement); + swap(a.dataNameLocation, b.dataNameLocation); swap(a.__isset, b.__isset); } -const char* ApplicationInterfaceDescription::ascii_fingerprint = "355A0972969341C2A113049339427849"; -const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0x35,0x5A,0x09,0x72,0x96,0x93,0x41,0xC2,0xA1,0x13,0x04,0x93,0x39,0x42,0x78,0x49}; +const char* ApplicationInterfaceDescription::ascii_fingerprint = "CE1749A2DE50827990C3136E0CE4B60D"; +const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0xCE,0x17,0x49,0xA2,0xDE,0x50,0x82,0x79,0x90,0xC3,0x13,0x6E,0x0C,0xE4,0xB6,0x0D}; uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -344,14 +478,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt if (ftype == ::apache::thrift::protocol::T_LIST) { { this->applicationModules.clear(); - 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) + uint32_t _size5; + ::apache::thrift::protocol::TType _etype8; + xfer += iprot->readListBegin(_etype8, _size5); + this->applicationModules.resize(_size5); + uint32_t _i9; + for (_i9 = 0; _i9 < _size5; ++_i9) { - xfer += iprot->readString(this->applicationModules[_i6]); + xfer += iprot->readString(this->applicationModules[_i9]); } xfer += iprot->readListEnd(); } @@ -364,14 +498,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt if (ftype == ::apache::thrift::protocol::T_LIST) { { this->applicationInputs.clear(); - 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) + uint32_t _size10; + ::apache::thrift::protocol::TType _etype13; + xfer += iprot->readListBegin(_etype13, _size10); + this->applicationInputs.resize(_size10); + uint32_t _i14; + for (_i14 = 0; _i14 < _size10; ++_i14) { - xfer += this->applicationInputs[_i11].read(iprot); + xfer += this->applicationInputs[_i14].read(iprot); } xfer += iprot->readListEnd(); } @@ -384,14 +518,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt if (ftype == ::apache::thrift::protocol::T_LIST) { { this->applicationOutputs.clear(); - 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) + uint32_t _size15; + ::apache::thrift::protocol::TType _etype18; + xfer += iprot->readListBegin(_etype18, _size15); + this->applicationOutputs.resize(_size15); + uint32_t _i19; + for (_i19 = 0; _i19 < _size15; ++_i19) { - xfer += this->applicationOutputs[_i16].read(iprot); + xfer += this->applicationOutputs[_i19].read(iprot); } xfer += iprot->readListEnd(); } @@ -437,10 +571,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 _iter17; - for (_iter17 = this->applicationModules.begin(); _iter17 != this->applicationModules.end(); ++_iter17) + std::vector<std::string> ::const_iterator _iter20; + for (_iter20 = this->applicationModules.begin(); _iter20 != this->applicationModules.end(); ++_iter20) { - xfer += oprot->writeString((*_iter17)); + xfer += oprot->writeString((*_iter20)); } xfer += oprot->writeListEnd(); } @@ -450,10 +584,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 _iter18; - for (_iter18 = this->applicationInputs.begin(); _iter18 != this->applicationInputs.end(); ++_iter18) + std::vector<InputDataObjectType> ::const_iterator _iter21; + for (_iter21 = this->applicationInputs.begin(); _iter21 != this->applicationInputs.end(); ++_iter21) { - xfer += (*_iter18).write(oprot); + xfer += (*_iter21).write(oprot); } xfer += oprot->writeListEnd(); } @@ -463,10 +597,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 _iter19; - for (_iter19 = this->applicationOutputs.begin(); _iter19 != this->applicationOutputs.end(); ++_iter19) + std::vector<OutputDataObjectType> ::const_iterator _iter22; + for (_iter22 = this->applicationOutputs.begin(); _iter22 != this->applicationOutputs.end(); ++_iter22) { - xfer += (*_iter19).write(oprot); + xfer += (*_iter22).write(oprot); } xfer += oprot->writeListEnd(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 961feea..7a7ab52 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,23 +47,54 @@ 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 { + INCLUSIVE = 0, + EXCLUSIVE = 1 + }; +}; + +extern const std::map<int, const char*> _CommandLineType_VALUES_TO_NAMES; + +struct InputMetadataType { + enum type { + MEMORY = 0, + CPU = 1 + }; +}; + +extern const std::map<int, const char*> _InputMetadataType_VALUES_TO_NAMES; + typedef struct _InputDataObjectType__isset { - _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false) {} + _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false), inputOrder(false), inputValid(false), addedToCommandLine(false), dataStaged(true) {} bool value; bool type; bool applicationArgument; bool standardInput; bool userFriendlyDescription; bool metaData; + bool inputOrder; + bool inputValid; + bool addedToCommandLine; + bool dataStaged; } _InputDataObjectType__isset; class InputDataObjectType { public: - static const char* ascii_fingerprint; // = "24F962C1CE4BE9FBD0F5D5EE9D1D5C00"; - static const uint8_t binary_fingerprint[16]; // = {0x24,0xF9,0x62,0xC1,0xCE,0x4B,0xE9,0xFB,0xD0,0xF5,0xD5,0xEE,0x9D,0x1D,0x5C,0x00}; + 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}; - InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData() { + InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData(), inputOrder(0), inputValid((ValidityType::type)0), addedToCommandLine((CommandLineType::type)0), dataStaged(false) { } virtual ~InputDataObjectType() throw() {} @@ -75,6 +106,10 @@ class InputDataObjectType { bool standardInput; std::string userFriendlyDescription; std::string metaData; + int32_t inputOrder; + ValidityType::type inputValid; + CommandLineType::type addedToCommandLine; + bool dataStaged; _InputDataObjectType__isset __isset; @@ -112,6 +147,26 @@ class InputDataObjectType { __isset.metaData = true; } + void __set_inputOrder(const int32_t val) { + inputOrder = val; + __isset.inputOrder = true; + } + + void __set_inputValid(const ValidityType::type val) { + inputValid = val; + __isset.inputValid = true; + } + + void __set_addedToCommandLine(const CommandLineType::type val) { + addedToCommandLine = val; + __isset.addedToCommandLine = true; + } + + void __set_dataStaged(const bool val) { + dataStaged = val; + __isset.dataStaged = true; + } + bool operator == (const InputDataObjectType & rhs) const { if (!(name == rhs.name)) @@ -140,6 +195,22 @@ class InputDataObjectType { return false; else if (__isset.metaData && !(metaData == rhs.metaData)) return false; + if (__isset.inputOrder != rhs.__isset.inputOrder) + return false; + else if (__isset.inputOrder && !(inputOrder == rhs.inputOrder)) + return false; + if (__isset.inputValid != rhs.__isset.inputValid) + return false; + else if (__isset.inputValid && !(inputValid == rhs.inputValid)) + return false; + if (__isset.addedToCommandLine != rhs.__isset.addedToCommandLine) + return false; + else if (__isset.addedToCommandLine && !(addedToCommandLine == rhs.addedToCommandLine)) + return false; + if (__isset.dataStaged != rhs.__isset.dataStaged) + return false; + else if (__isset.dataStaged && !(dataStaged == rhs.dataStaged)) + return false; return true; } bool operator != (const InputDataObjectType &rhs) const { @@ -156,18 +227,21 @@ class InputDataObjectType { void swap(InputDataObjectType &a, InputDataObjectType &b); typedef struct _OutputDataObjectType__isset { - _OutputDataObjectType__isset() : value(false), type(false) {} + _OutputDataObjectType__isset() : value(false), type(false), validityType(false), dataMovement(false), dataNameLocation(false) {} bool value; bool type; + bool validityType; + bool dataMovement; + bool dataNameLocation; } _OutputDataObjectType__isset; class OutputDataObjectType { public: - static const char* ascii_fingerprint; // = "B33AE596EF78C48424CF96BCA5D1DF99"; - static const uint8_t binary_fingerprint[16]; // = {0xB3,0x3A,0xE5,0x96,0xEF,0x78,0xC4,0x84,0x24,0xCF,0x96,0xBC,0xA5,0xD1,0xDF,0x99}; + static const char* ascii_fingerprint; // = "9B8C3AEA43A2028DF0CEF51E90706E3A"; + static const uint8_t binary_fingerprint[16]; // = {0x9B,0x8C,0x3A,0xEA,0x43,0xA2,0x02,0x8D,0xF0,0xCE,0xF5,0x1E,0x90,0x70,0x6E,0x3A}; - OutputDataObjectType() : name(), value(), type((DataType::type)0) { + OutputDataObjectType() : name(), value(), type((DataType::type)0), validityType((ValidityType::type)0), dataMovement(0), dataNameLocation() { } virtual ~OutputDataObjectType() throw() {} @@ -175,6 +249,9 @@ class OutputDataObjectType { std::string name; std::string value; DataType::type type; + ValidityType::type validityType; + bool dataMovement; + std::string dataNameLocation; _OutputDataObjectType__isset __isset; @@ -192,6 +269,21 @@ class OutputDataObjectType { __isset.type = true; } + void __set_validityType(const ValidityType::type val) { + validityType = val; + __isset.validityType = true; + } + + void __set_dataMovement(const bool val) { + dataMovement = val; + __isset.dataMovement = true; + } + + void __set_dataNameLocation(const std::string& val) { + dataNameLocation = val; + __isset.dataNameLocation = true; + } + bool operator == (const OutputDataObjectType & rhs) const { if (!(name == rhs.name)) @@ -204,6 +296,18 @@ class OutputDataObjectType { return false; else if (__isset.type && !(type == rhs.type)) return false; + if (__isset.validityType != rhs.__isset.validityType) + return false; + else if (__isset.validityType && !(validityType == rhs.validityType)) + return false; + if (__isset.dataMovement != rhs.__isset.dataMovement) + return false; + else if (__isset.dataMovement && !(dataMovement == rhs.dataMovement)) + return false; + if (__isset.dataNameLocation != rhs.__isset.dataNameLocation) + return false; + else if (__isset.dataNameLocation && !(dataNameLocation == rhs.dataNameLocation)) + return false; return true; } bool operator != (const OutputDataObjectType &rhs) const { @@ -230,8 +334,8 @@ typedef struct _ApplicationInterfaceDescription__isset { class ApplicationInterfaceDescription { public: - static const char* ascii_fingerprint; // = "355A0972969341C2A113049339427849"; - static const uint8_t binary_fingerprint[16]; // = {0x35,0x5A,0x09,0x72,0x96,0x93,0x41,0xC2,0xA1,0x13,0x04,0x93,0x39,0x42,0x78,0x49}; + static const char* ascii_fingerprint; // = "CE1749A2DE50827990C3136E0CE4B60D"; + static const uint8_t binary_fingerprint[16]; // = {0xCE,0x17,0x49,0xA2,0xDE,0x50,0x82,0x79,0x90,0xC3,0x13,0x6E,0x0C,0xE4,0xB6,0x0D}; ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 18a2674..0d92089 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 = "C0E50EB91BEBDC23A45D03BFD2BD630A"; -const uint8_t TaskDetails::binary_fingerprint[16] = {0xC0,0xE5,0x0E,0xB9,0x1B,0xEB,0xDC,0x23,0xA4,0x5D,0x03,0xBF,0xD2,0xBD,0x63,0x0A}; +const char* TaskDetails::ascii_fingerprint = "09A94E3E2FA720626BDA3CA7ADC1CB70"; +const uint8_t TaskDetails::binary_fingerprint[16] = {0x09,0xA9,0x4E,0x3E,0x2F,0xA7,0x20,0x62,0x6B,0xDA,0x3C,0xA7,0xAD,0xC1,0xCB,0x70}; 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 = "F9600D5A8E84EAF65A64E38C18DFACAE"; -const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0xF9,0x60,0x0D,0x5A,0x8E,0x84,0xEA,0xF6,0x5A,0x64,0xE3,0x8C,0x18,0xDF,0xAC,0xAE}; +const char* WorkflowNodeDetails::ascii_fingerprint = "851CFB79378E39B6C03385F9272B8A93"; +const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x85,0x1C,0xFB,0x79,0x37,0x8E,0x39,0xB6,0xC0,0x33,0x85,0xF9,0x27,0x2B,0x8A,0x93}; 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 = "CDFB79AEABF988D5D38D8EEAEEBECC6F"; -const uint8_t Experiment::binary_fingerprint[16] = {0xCD,0xFB,0x79,0xAE,0xAB,0xF9,0x88,0xD5,0xD3,0x8D,0x8E,0xEA,0xEE,0xBE,0xCC,0x6F}; +const char* Experiment::ascii_fingerprint = "1390A2E18FD8CF984CDDD4E167ED1E67"; +const uint8_t Experiment::binary_fingerprint[16] = {0x13,0x90,0xA2,0xE1,0x8F,0xD8,0xCF,0x98,0x4C,0xDD,0xD4,0xE1,0x67,0xED,0x1E,0x67}; uint32_t Experiment::read(::apache::thrift::protocol::TProtocol* iprot) { http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 c4edbb7..80701b5 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; // = "C0E50EB91BEBDC23A45D03BFD2BD630A"; - static const uint8_t binary_fingerprint[16]; // = {0xC0,0xE5,0x0E,0xB9,0x1B,0xEB,0xDC,0x23,0xA4,0x5D,0x03,0xBF,0xD2,0xBD,0x63,0x0A}; + static const char* ascii_fingerprint; // = "09A94E3E2FA720626BDA3CA7ADC1CB70"; + static const uint8_t binary_fingerprint[16]; // = {0x09,0xA9,0x4E,0x3E,0x2F,0xA7,0x20,0x62,0x6B,0xDA,0x3C,0xA7,0xAD,0xC1,0xCB,0x70}; 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; // = "F9600D5A8E84EAF65A64E38C18DFACAE"; - static const uint8_t binary_fingerprint[16]; // = {0xF9,0x60,0x0D,0x5A,0x8E,0x84,0xEA,0xF6,0x5A,0x64,0xE3,0x8C,0x18,0xDF,0xAC,0xAE}; + static const char* ascii_fingerprint; // = "851CFB79378E39B6C03385F9272B8A93"; + static const uint8_t binary_fingerprint[16]; // = {0x85,0x1C,0xFB,0x79,0x37,0x8E,0x39,0xB6,0xC0,0x33,0x85,0xF9,0x27,0x2B,0x8A,0x93}; 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; // = "CDFB79AEABF988D5D38D8EEAEEBECC6F"; - static const uint8_t binary_fingerprint[16]; // = {0xCD,0xFB,0x79,0xAE,0xAB,0xF9,0x88,0xD5,0xD3,0x8D,0x8E,0xEA,0xEE,0xBE,0xCC,0x6F}; + static const char* ascii_fingerprint; // = "1390A2E18FD8CF984CDDD4E167ED1E67"; + static const uint8_t binary_fingerprint[16]; // = {0x13,0x90,0xA2,0xE1,0x8F,0xD8,0xCF,0x98,0x4C,0xDD,0xD4,0xE1,0x67,0xED,0x1E,0x67}; 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/63a561c3/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 4bfd1bc..2297e40 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 = "850570A8E8883AE24DE92AFC9AA86C7E"; -const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0x85,0x05,0x70,0xA8,0xE8,0x88,0x3A,0xE2,0x4D,0xE9,0x2A,0xFC,0x9A,0xA8,0x6C,0x7E}; +const char* TaskOutputChangeEvent::ascii_fingerprint = "CD10AFEB7332120253CE0C3FFCF54C48"; +const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xCD,0x10,0xAF,0xEB,0x73,0x32,0x12,0x02,0x53,0xCE,0x0C,0x3F,0xFC,0xF5,0x4C,0x48}; uint32_t TaskOutputChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) { http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 61dc55f..3596539 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; // = "850570A8E8883AE24DE92AFC9AA86C7E"; - static const uint8_t binary_fingerprint[16]; // = {0x85,0x05,0x70,0xA8,0xE8,0x88,0x3A,0xE2,0x4D,0xE9,0x2A,0xFC,0x9A,0xA8,0x6C,0x7E}; + static const char* ascii_fingerprint; // = "CD10AFEB7332120253CE0C3FFCF54C48"; + static const uint8_t binary_fingerprint[16]; // = {0xCD,0x10,0xAF,0xEB,0x73,0x32,0x12,0x02,0x53,0xCE,0x0C,0x3F,0xFC,0xF5,0x4C,0x48}; TaskOutputChangeEvent() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 53f0b70..cffa250 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 = "0F4DE03295CE4C20055DE0E68CFA7A65"; -const uint8_t Workflow::binary_fingerprint[16] = {0x0F,0x4D,0xE0,0x32,0x95,0xCE,0x4C,0x20,0x05,0x5D,0xE0,0xE6,0x8C,0xFA,0x7A,0x65}; +const char* Workflow::ascii_fingerprint = "4320FCC5DE6949377139919B68E7F5C1"; +const uint8_t Workflow::binary_fingerprint[16] = {0x43,0x20,0xFC,0xC5,0xDE,0x69,0x49,0x37,0x71,0x39,0x91,0x9B,0x68,0xE7,0xF5,0xC1}; uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) { http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 d688702..b46858d 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; // = "0F4DE03295CE4C20055DE0E68CFA7A65"; - static const uint8_t binary_fingerprint[16]; // = {0x0F,0x4D,0xE0,0x32,0x95,0xCE,0x4C,0x20,0x05,0x5D,0xE0,0xE6,0x8C,0xFA,0x7A,0x65}; + static const char* ascii_fingerprint; // = "4320FCC5DE6949377139919B68E7F5C1"; + static const uint8_t binary_fingerprint[16]; // = {0x43,0x20,0xFC,0xC5,0xDE,0x69,0x49,0x37,0x71,0x39,0x91,0x9B,0x68,0xE7,0xF5,0xC1}; Workflow() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), image() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 5350e10..4983eb2 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,6 +34,33 @@ final class DataType { ); } +final class ValidityType { + const REQUIRED = 0; + const OPTIONAL = 1; + static public $__names = array( + 0 => 'REQUIRED', + 1 => 'OPTIONAL', + ); +} + +final class CommandLineType { + const INCLUSIVE = 0; + const EXCLUSIVE = 1; + static public $__names = array( + 0 => 'INCLUSIVE', + 1 => 'EXCLUSIVE', + ); +} + +final class InputMetadataType { + const MEMORY = 0; + const CPU = 1; + static public $__names = array( + 0 => 'MEMORY', + 1 => 'CPU', + ); +} + class InputDataObjectType { static $_TSPEC; @@ -44,6 +71,10 @@ class InputDataObjectType { public $standardInput = false; public $userFriendlyDescription = null; public $metaData = null; + public $inputOrder = null; + public $inputValid = null; + public $addedToCommandLine = null; + public $dataStaged = false; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -76,6 +107,22 @@ class InputDataObjectType { 'var' => 'metaData', 'type' => TType::STRING, ), + 8 => array( + 'var' => 'inputOrder', + 'type' => TType::I32, + ), + 9 => array( + 'var' => 'inputValid', + 'type' => TType::I32, + ), + 10 => array( + 'var' => 'addedToCommandLine', + 'type' => TType::I32, + ), + 11 => array( + 'var' => 'dataStaged', + 'type' => TType::BOOL, + ), ); } if (is_array($vals)) { @@ -100,6 +147,18 @@ class InputDataObjectType { if (isset($vals['metaData'])) { $this->metaData = $vals['metaData']; } + if (isset($vals['inputOrder'])) { + $this->inputOrder = $vals['inputOrder']; + } + if (isset($vals['inputValid'])) { + $this->inputValid = $vals['inputValid']; + } + if (isset($vals['addedToCommandLine'])) { + $this->addedToCommandLine = $vals['addedToCommandLine']; + } + if (isset($vals['dataStaged'])) { + $this->dataStaged = $vals['dataStaged']; + } } } @@ -171,6 +230,34 @@ class InputDataObjectType { $xfer += $input->skip($ftype); } break; + case 8: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->inputOrder); + } else { + $xfer += $input->skip($ftype); + } + break; + case 9: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->inputValid); + } else { + $xfer += $input->skip($ftype); + } + break; + case 10: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->addedToCommandLine); + } else { + $xfer += $input->skip($ftype); + } + break; + case 11: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->dataStaged); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -219,6 +306,26 @@ class InputDataObjectType { $xfer += $output->writeString($this->metaData); $xfer += $output->writeFieldEnd(); } + if ($this->inputOrder !== null) { + $xfer += $output->writeFieldBegin('inputOrder', TType::I32, 8); + $xfer += $output->writeI32($this->inputOrder); + $xfer += $output->writeFieldEnd(); + } + if ($this->inputValid !== null) { + $xfer += $output->writeFieldBegin('inputValid', TType::I32, 9); + $xfer += $output->writeI32($this->inputValid); + $xfer += $output->writeFieldEnd(); + } + if ($this->addedToCommandLine !== null) { + $xfer += $output->writeFieldBegin('addedToCommandLine', TType::I32, 10); + $xfer += $output->writeI32($this->addedToCommandLine); + $xfer += $output->writeFieldEnd(); + } + if ($this->dataStaged !== null) { + $xfer += $output->writeFieldBegin('dataStaged', TType::BOOL, 11); + $xfer += $output->writeBool($this->dataStaged); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -232,6 +339,9 @@ class OutputDataObjectType { public $name = null; public $value = null; public $type = null; + public $validityType = null; + public $dataMovement = null; + public $dataNameLocation = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -248,6 +358,18 @@ class OutputDataObjectType { 'var' => 'type', 'type' => TType::I32, ), + 4 => array( + 'var' => 'validityType', + 'type' => TType::I32, + ), + 5 => array( + 'var' => 'dataMovement', + 'type' => TType::BOOL, + ), + 6 => array( + 'var' => 'dataNameLocation', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -260,6 +382,15 @@ class OutputDataObjectType { if (isset($vals['type'])) { $this->type = $vals['type']; } + if (isset($vals['validityType'])) { + $this->validityType = $vals['validityType']; + } + if (isset($vals['dataMovement'])) { + $this->dataMovement = $vals['dataMovement']; + } + if (isset($vals['dataNameLocation'])) { + $this->dataNameLocation = $vals['dataNameLocation']; + } } } @@ -303,6 +434,27 @@ class OutputDataObjectType { $xfer += $input->skip($ftype); } break; + case 4: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->validityType); + } else { + $xfer += $input->skip($ftype); + } + break; + case 5: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->dataMovement); + } else { + $xfer += $input->skip($ftype); + } + break; + case 6: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->dataNameLocation); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -331,6 +483,21 @@ 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); + $xfer += $output->writeFieldEnd(); + } + if ($this->dataMovement !== null) { + $xfer += $output->writeFieldBegin('dataMovement', TType::BOOL, 5); + $xfer += $output->writeBool($this->dataMovement); + $xfer += $output->writeFieldEnd(); + } + if ($this->dataNameLocation !== null) { + $xfer += $output->writeFieldBegin('dataNameLocation', TType::STRING, 6); + $xfer += $output->writeString($this->dataNameLocation); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 1fa62ab..28f01f5 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 @@ -176,7 +176,7 @@ public class RegisterSampleData { appModules.add(echoModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World", - DataType.STRING, null, false, "A test string to Echo", null); + DataType.STRING, null, 1, false, "A test string to Echo", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -205,9 +205,9 @@ public class RegisterSampleData { appModules.add(addModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "2", - DataType.STRING, null, false, "Add operation input_1", null); + DataType.STRING, null, 1, false, "Add operation input_1", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "3", - DataType.STRING, null, false, "Add operation input_2", null); + DataType.STRING, null, 2, false, "Add operation input_2", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -237,9 +237,9 @@ public class RegisterSampleData { appModules.add(multiplyModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "4", - DataType.STRING, null, false, "Multiply operation input_1", null); + DataType.STRING, null, 1, false, "Multiply operation input_1", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "5", - DataType.STRING, null, false, "Multiply operation input_2", null); + DataType.STRING, null, 2, false, "Multiply operation input_2", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -269,9 +269,9 @@ public class RegisterSampleData { appModules.add(subtractModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "6", - DataType.STRING, null, false, "Subtract operation input_1", null); + DataType.STRING, null, 1, false, "Subtract operation input_1", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "7", - DataType.STRING, null, false, "Subtract operation input_2", null); + DataType.STRING, null, 2, false, "Subtract operation input_2", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 2b7c195..9ba0b4b 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 @@ -154,7 +154,7 @@ public class RegisterOGCEUS3Application { appModules.add(ultrascanModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null, - DataType.URI, null, false, "input tar file", null); + DataType.URI, null, 1, false, "input tar file", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 9a2aaf7..18408b7 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 @@ -370,7 +370,7 @@ public class RegisterSampleApplications { List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("s_struct", "", - DataType.URI, null, false, "Starting Structure File", null)); + DataType.URI, null, 1, false, "Starting Structure File", null)); List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>(); @@ -387,11 +387,11 @@ public class RegisterSampleApplications { applicationInputs.clear(); applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("ffcomplient_struct", "", - DataType.URI, null, false, "FFComplient Structure File", null)); + DataType.URI, null, 1, false, "FFComplient Structure File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology", "", - DataType.URI, null, false, "Topology File", null)); + DataType.URI, null, 2, false, "Topology File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("control_param_emv", "", - DataType.URI, null, false, "Controlled parameters array of EM Vacuum", null)); + DataType.URI, null, 3, false, "Controlled parameters array of EM Vacuum", null)); applicationOutputs.clear(); @@ -406,7 +406,7 @@ public class RegisterSampleApplications { applicationInputs.clear(); applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("energy_min_struct", "", - DataType.URI, null, false, "Energy Minimized Structure File", null)); + DataType.URI, null, 1, false, "Energy Minimized Structure File", null)); applicationOutputs.clear(); applicationOutputs = new ArrayList<OutputDataObjectType>(); @@ -420,11 +420,11 @@ public class RegisterSampleApplications { applicationInputs.clear(); applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("struct_with_pbc", "", - DataType.URI, null, false, "Structure with PBC File", null)); + DataType.URI, null, 1, false, "Structure with PBC File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("solvent_struct", "", - DataType.URI, null, false, "Solvent Structure File", null)); + DataType.URI, null, 2, false, "Solvent Structure File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology", "", - DataType.URI, null, false, "Topology File", null)); + DataType.URI, null, 3, false, "Topology File", null)); applicationOutputs.clear(); applicationOutputs = new ArrayList<OutputDataObjectType>(); @@ -441,11 +441,11 @@ public class RegisterSampleApplications { applicationInputs.clear(); applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("struct_with_water", "", - DataType.URI, null, false, "Structure with water File", null)); + DataType.URI, null, 1, false, "Structure with water File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology_with_water", "", - DataType.URI, null, false, "Topology including water File", null)); + DataType.URI, null, 2, false, "Topology including water File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("control_param_emv", "", - DataType.URI, null, false, "Controlled parameters array of EM Vacuum", null)); + DataType.URI, null, 3, false, "Controlled parameters array of EM Vacuum", null)); applicationOutputs.clear(); applicationOutputs = new ArrayList<OutputDataObjectType>(); @@ -459,9 +459,9 @@ public class RegisterSampleApplications { applicationInputs.clear(); applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("struct_topoogy", "", - DataType.URI, null, false, "Structure and Topology File", null)); + DataType.URI, null, 1, false, "Structure and Topology File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology_with_water", "", - DataType.URI, null, false, "Topology including water File", null)); + DataType.URI, null, 2, false, "Topology including water File", null)); applicationOutputs.clear(); applicationOutputs = new ArrayList<OutputDataObjectType>(); @@ -478,11 +478,11 @@ public class RegisterSampleApplications { applicationInputs.clear(); applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("sys_topoogy", "", - DataType.URI, null, false, "Structure and Topology File", null)); + DataType.URI, null, 1, false, "Structure and Topology File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("sys_config", "", - DataType.URI, null, false, "Topology including water File", null)); + DataType.URI, null, 2, false, "Topology including water File", null)); applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("control_param_ems", "", - DataType.URI, null, false, "Controlled parameters array of EM Solvent", null)); + DataType.URI, null, 3, false, "Controlled parameters array of EM Solvent", null)); applicationOutputs.clear(); applicationOutputs = new ArrayList<OutputDataObjectType>(); @@ -508,7 +508,7 @@ public class RegisterSampleApplications { appModules.add(echoModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("echo_input", "echo_output=Hello World", - DataType.STRING, null, false, "A test string to Echo", null); + DataType.STRING, null, 1, false, "A test string to Echo", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -536,18 +536,19 @@ public class RegisterSampleApplications { List<String> appModules = new ArrayList<String>(); appModules.add(echoModuleId); + InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "", - DataType.STRING, null, false, "A test string to Echo", null); + DataType.STRING, null, 1, false, "A test string to Echo", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo2", "", - DataType.URI, null, false, "A sample input remote file", null); + DataType.URI, null, 2, false, "A sample input remote file", null); InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo3", "file:///tmp/test.txt", - DataType.URI, null, false, "A sample input local file", null); + DataType.URI, null, 3, false, "A sample input local file", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); - applicationInputs.add(input1); + applicationInputs.add(input1); applicationInputs.add(input2); applicationInputs.add(input3); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output", "", DataType.STRING); @@ -575,7 +576,7 @@ public class RegisterSampleApplications { appModules.add(mpiModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Sample_Input", "", - DataType.STRING, null, false, "An optional MPI source file", null); + DataType.STRING, null, 1, false, "An optional MPI source file", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -606,13 +607,13 @@ public class RegisterSampleApplications { appModules.add(amberModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Heat_Restart_File", null, - DataType.URI, null, false, "Heating up the system equilibration stage - 02_Heat.rst", null); + DataType.URI, null, 1, false, "Heating up the system equilibration stage - 02_Heat.rst", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Production_Control_File", null, - DataType.URI, null, false, "Constant pressure and temperature for production stage - 03_Prod.in", null); + DataType.URI, null, 2, false, "Constant pressure and temperature for production stage - 03_Prod.in", null); InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Parameter_Topology_File", null, - DataType.URI, null, false, "Parameter and Topology coordinates - prmtop", null); + DataType.URI, null, 3, false, "Parameter and Topology coordinates - prmtop", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -648,13 +649,13 @@ public class RegisterSampleApplications { appModules.add(autoDockModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Heat_Restart_File", null, - DataType.URI, null, false, "Heating up the system equilibration stage", null); + DataType.URI, null, 1, false, "Heating up the system equilibration stage", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Production_Control_File", null, - DataType.URI, null, false, "Constant pressure and temperature for production stage", null); + DataType.URI, null, 2, false, "Constant pressure and temperature for production stage", null); InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Parameter_Topology_File", null, - DataType.URI, null, false, "Parameter and Topology coordinates", null); + DataType.URI, null, 3, false, "Parameter and Topology coordinates", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -685,10 +686,10 @@ public class RegisterSampleApplications { appModules.add(espressoModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("AI_Primitive_Cell", null, - DataType.URI, null, false, "AI_Metal_Input_File - Al.sample.in", null); + DataType.URI, null, 1, false, "AI_Metal_Input_File - Al.sample.in", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("AI_Pseudopotential_File", null, - DataType.URI, null, false, "Constant pressure and temperature for production stage - Al.pz-vbc.UPF", null); + DataType.URI, null, 2, false, "Constant pressure and temperature for production stage - Al.pz-vbc.UPF", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -719,10 +720,10 @@ public class RegisterSampleApplications { appModules.add(gromacsModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Portable_Input_Binary_File", null, - DataType.URI, null, false, "Coordinates velocities, molecular topology and simulation parameters - pdb1y6l-EM-vacuum.tpr", null); + DataType.URI, null, 1, false, "Coordinates velocities, molecular topology and simulation parameters - pdb1y6l-EM-vacuum.tpr", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("GROMOS_Coordinate_File", null, - DataType.URI, null, false, "Trajectory Coordinates Molecular Structure in Gromos87 format - pdb1y6l-EM-vacuum.gro", null); + DataType.URI, null, 2, false, "Trajectory Coordinates Molecular Structure in Gromos87 format - pdb1y6l-EM-vacuum.gro", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -755,7 +756,7 @@ public class RegisterSampleApplications { appModules.add(lammpsModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Friction_Simulation_Input", null, - DataType.URI, null, false, "Friction Simulation Input - in.friction", null); + DataType.URI, null, 1, false, "Friction Simulation Input - in.friction", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -783,7 +784,7 @@ public class RegisterSampleApplications { appModules.add(nwChemModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Water_Molecule_Input", null, - DataType.URI, null, false, "Water Molecule Input File - water.nw", null); + DataType.URI, null, 1, false, "Water Molecule Input File - water.nw", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -812,10 +813,10 @@ public class RegisterSampleApplications { appModules.add(trinityModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("RNA_Seq_Left_Input", null, - DataType.URI, null, false, "RNA-Seq Left Library - reads.left.fq", null); + DataType.URI, null, 1, false, "RNA-Seq Left Library - reads.left.fq", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("RNA_Seq_Right_Input", null, - DataType.URI, null, false, "RNA-Seq Right Library - reads.right.fq", null); + DataType.URI, null, 2, false, "RNA-Seq Right Library - reads.right.fq", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -847,13 +848,13 @@ public class RegisterSampleApplications { appModules.add(wrfModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Config_Namelist_File", null, - DataType.URI, null, false, "Namelist Configuration File - namelist.input", null); + DataType.URI, null, 1, false, "Namelist Configuration File - namelist.input", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("WRF_Initial_Conditions", null, - DataType.URI, null, false, "Initial Conditions File - wrfinput_d01", null); + DataType.URI, null, 2, false, "Initial Conditions File - wrfinput_d01", null); InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("WRF_Boundary_File", null, - DataType.URI, null, false, "Boundary Conditions File - wrfbdy_d01", null); + DataType.URI, null, 3, false, "Boundary Conditions File - wrfbdy_d01", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); @@ -888,13 +889,13 @@ public class RegisterSampleApplications { appModules.add(phastaModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Parasolid_Geometric_Model", null, - DataType.URI, null, false, "Parasolid geometric model - geom.xmt_txt", null); + DataType.URI, null, 1, false, "Parasolid geometric model - geom.xmt_txt", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Problem_Definition", null, - DataType.URI, null, false, "problem definition - geom.smd", null); + DataType.URI, null, 2, false, "problem definition - geom.smd", null); InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Mesh_Description_File", null, - DataType.URI, null, false, "Mesh Description - geom.sms", null); + DataType.URI, null, 3, false, "Mesh Description - geom.sms", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 34f770a..58ba387 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 @@ -120,13 +120,14 @@ public class RegisterSampleApplicationsUtils { public static InputDataObjectType createAppInput (String inputName, String value, DataType type, - String applicationArgument, boolean stdIn, String description, String metadata) { + String applicationArgument, int order, boolean stdIn, String description, String metadata) { InputDataObjectType input = new InputDataObjectType(); // input.setIsEmpty(false); if (inputName != null) input.setName(inputName); if (value != null) input.setValue(value); if (type != null) input.setType(type); if (applicationArgument != null) input.setApplicationArgument(applicationArgument); + input.setInputOrder(order); if (description != null) input.setUserFriendlyDescription(description); input.setStandardInput(stdIn); if (metadata != null) input.setMetaData(metadata); http://git-wip-us.apache.org/repos/asf/airavata/blob/63a561c3/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 ccb4e24..0e86469 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 @@ -154,7 +154,7 @@ public class RegisterUS3Application { appModules.add(ultrascanModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null, - DataType.URI, null, false, "input tar file", null); + DataType.URI, null, 1, false, "input tar file", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1);
