Repository: airavata Updated Branches: refs/heads/gfac_appcatalog_int f9fdf53e7 -> 088e80f03
Added STdOUT and STDERR types to DataType enum Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/428b2407 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/428b2407 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/428b2407 Branch: refs/heads/gfac_appcatalog_int Commit: 428b24075b7ac82109fbd5ab20df314b549da96e Parents: 0b95d3b Author: shamrath <shameerai...@gmail.com> Authored: Thu Nov 6 16:57:51 2014 -0500 Committer: shamrath <shameerai...@gmail.com> Committed: Thu Nov 6 16:57:51 2014 -0500 ---------------------------------------------------------------------- .../lib/airavata/applicationInterfaceModel_types.cpp | 10 +++++++--- .../lib/airavata/applicationInterfaceModel_types.h | 4 +++- .../lib/Airavata/Model/AppCatalog/AppInterface/Types.php | 4 ++++ .../airavata/model/appcatalog/appinterface/DataType.java | 8 +++++++- .../applicationInterfaceModel.thrift | 4 +++- 5 files changed, 24 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/428b2407/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 4a171a7..a324d13 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 @@ -31,15 +31,19 @@ int _kDataTypeValues[] = { DataType::STRING, DataType::INTEGER, DataType::FLOAT, - DataType::URI + DataType::URI, + DataType::STDOUT, + DataType::STDERR }; const char* _kDataTypeNames[] = { "STRING", "INTEGER", "FLOAT", - "URI" + "URI", + "STDOUT", + "STDERR" }; -const std::map<int, const char*> _DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kDataTypeValues, _kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); +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}; http://git-wip-us.apache.org/repos/asf/airavata/blob/428b2407/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 a3c6d86..fbbd7cb 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 @@ -39,7 +39,9 @@ struct DataType { STRING = 0, INTEGER = 1, FLOAT = 2, - URI = 3 + URI = 3, + STDOUT = 4, + STDERR = 5 }; }; http://git-wip-us.apache.org/repos/asf/airavata/blob/428b2407/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 07b5c9e..e0cf00b 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 @@ -22,11 +22,15 @@ final class DataType { const INTEGER = 1; const FLOAT = 2; const URI = 3; + const STDOUT = 4; + const STDERR = 5; static public $__names = array( 0 => 'STRING', 1 => 'INTEGER', 2 => 'FLOAT', 3 => 'URI', + 4 => 'STDOUT', + 5 => 'STDERR', ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/428b2407/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java index b3771ad..dc14aac 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java @@ -36,7 +36,9 @@ import org.apache.thrift.TEnum; STRING(0), INTEGER(1), FLOAT(2), - URI(3); + URI(3), + STDOUT(4), + STDERR(5); private final int value; @@ -65,6 +67,10 @@ import org.apache.thrift.TEnum; return FLOAT; case 3: return URI; + case 4: + return STDOUT; + case 5: + return STDERR; default: return null; } http://git-wip-us.apache.org/repos/asf/airavata/blob/428b2407/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift index 7a33078..5dcb809 100644 --- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift +++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift @@ -38,7 +38,9 @@ enum DataType{ STRING, INTEGER, FLOAT, - URI + URI, + STDOUT, + STDERR } /**