airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [06/11] airavata git commit: messaging data models
Date Tue, 23 Jun 2015 16:04:57 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/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 02e5749..df31203 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
@@ -18,643 +18,6 @@ use Thrift\Exception\TApplicationException;
 
 
 /**
- * Data Types supported in Airavata. The primitive data types
- * 
- */
-final class DataType {
-  const STRING = 0;
-  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',
-  );
-}
-
-/**
- * Application Inputs. The paramters describe how inputs are passed to the application.
- * 
- * name:
- *   Name of the parameter.
- * 
- * value:
- *   Value of the parameter. A default value could be set during registration.
- * 
- * type:
- *   Data type of the parameter
- * 
- * applicationArguement:
- *   The argument flag sent to the application. Such as -p pressure.
- * 
- * standardInput:
- *   When this value is set, the parameter is sent as standard input rather than a parameter.
- *   Typically this is passed using redirection operator ">".
- * 
- * userFriendlyDescription:
- *   Description to be displayed at the user interface.
- * 
- * metaData:
- *   Any metadat. This is typically ignore by Airavata and is used by gateways for application
configuration.
- * 
- */
-class InputDataObjectType {
-  static $_TSPEC;
-
-  /**
-   * @var string
-   */
-  public $name = null;
-  /**
-   * @var string
-   */
-  public $value = null;
-  /**
-   * @var int
-   */
-  public $type = null;
-  /**
-   * @var string
-   */
-  public $applicationArgument = null;
-  /**
-   * @var bool
-   */
-  public $standardInput = false;
-  /**
-   * @var string
-   */
-  public $userFriendlyDescription = null;
-  /**
-   * @var string
-   */
-  public $metaData = null;
-  /**
-   * @var int
-   */
-  public $inputOrder = null;
-  /**
-   * @var bool
-   */
-  public $isRequired = null;
-  /**
-   * @var bool
-   */
-  public $requiredToAddedToCommandLine = null;
-  /**
-   * @var bool
-   */
-  public $dataStaged = false;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'name',
-          'type' => TType::STRING,
-          ),
-        2 => array(
-          'var' => 'value',
-          'type' => TType::STRING,
-          ),
-        3 => array(
-          'var' => 'type',
-          'type' => TType::I32,
-          ),
-        4 => array(
-          'var' => 'applicationArgument',
-          'type' => TType::STRING,
-          ),
-        5 => array(
-          'var' => 'standardInput',
-          'type' => TType::BOOL,
-          ),
-        6 => array(
-          'var' => 'userFriendlyDescription',
-          'type' => TType::STRING,
-          ),
-        7 => array(
-          'var' => 'metaData',
-          'type' => TType::STRING,
-          ),
-        8 => array(
-          'var' => 'inputOrder',
-          'type' => TType::I32,
-          ),
-        9 => array(
-          'var' => 'isRequired',
-          'type' => TType::BOOL,
-          ),
-        10 => array(
-          'var' => 'requiredToAddedToCommandLine',
-          'type' => TType::BOOL,
-          ),
-        11 => array(
-          'var' => 'dataStaged',
-          'type' => TType::BOOL,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['name'])) {
-        $this->name = $vals['name'];
-      }
-      if (isset($vals['value'])) {
-        $this->value = $vals['value'];
-      }
-      if (isset($vals['type'])) {
-        $this->type = $vals['type'];
-      }
-      if (isset($vals['applicationArgument'])) {
-        $this->applicationArgument = $vals['applicationArgument'];
-      }
-      if (isset($vals['standardInput'])) {
-        $this->standardInput = $vals['standardInput'];
-      }
-      if (isset($vals['userFriendlyDescription'])) {
-        $this->userFriendlyDescription = $vals['userFriendlyDescription'];
-      }
-      if (isset($vals['metaData'])) {
-        $this->metaData = $vals['metaData'];
-      }
-      if (isset($vals['inputOrder'])) {
-        $this->inputOrder = $vals['inputOrder'];
-      }
-      if (isset($vals['isRequired'])) {
-        $this->isRequired = $vals['isRequired'];
-      }
-      if (isset($vals['requiredToAddedToCommandLine'])) {
-        $this->requiredToAddedToCommandLine = $vals['requiredToAddedToCommandLine'];
-      }
-      if (isset($vals['dataStaged'])) {
-        $this->dataStaged = $vals['dataStaged'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'InputDataObjectType';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->name);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 2:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->value);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->type);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 4:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->applicationArgument);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 5:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->standardInput);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 6:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->userFriendlyDescription);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 7:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->metaData);
-          } else {
-            $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::BOOL) {
-            $xfer += $input->readBool($this->isRequired);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 10:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->requiredToAddedToCommandLine);
-          } 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;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('InputDataObjectType');
-    if ($this->name !== null) {
-      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
-      $xfer += $output->writeString($this->name);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->value !== null) {
-      $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
-      $xfer += $output->writeString($this->value);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->type !== null) {
-      $xfer += $output->writeFieldBegin('type', TType::I32, 3);
-      $xfer += $output->writeI32($this->type);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->applicationArgument !== null) {
-      $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 4);
-      $xfer += $output->writeString($this->applicationArgument);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->standardInput !== null) {
-      $xfer += $output->writeFieldBegin('standardInput', TType::BOOL, 5);
-      $xfer += $output->writeBool($this->standardInput);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->userFriendlyDescription !== null) {
-      $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 6);
-      $xfer += $output->writeString($this->userFriendlyDescription);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->metaData !== null) {
-      $xfer += $output->writeFieldBegin('metaData', TType::STRING, 7);
-      $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->isRequired !== null) {
-      $xfer += $output->writeFieldBegin('isRequired', TType::BOOL, 9);
-      $xfer += $output->writeBool($this->isRequired);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->requiredToAddedToCommandLine !== null) {
-      $xfer += $output->writeFieldBegin('requiredToAddedToCommandLine', TType::BOOL, 10);
-      $xfer += $output->writeBool($this->requiredToAddedToCommandLine);
-      $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;
-  }
-
-}
-
-/**
- * Application Outputs. The paramters describe how outputs generated by the application.
- * 
- * name:
- *   Name of the parameter.
- * 
- * value:
- *   Value of the parameter.
- * 
- * type:
- *   Data type of the parameter
- * 
- * applicationArguement:
- *   The argument flag sent to the application. Such as -p pressure.
- * 
- * standardInput:
- *   When this value is set, the parameter is sent as standard input rather than a parameter.
- *   Typically this is passed using redirection operator ">".
- * 
- * userFriendlyDescription:
- *   Description to be displayed at the user interface.
- * 
- * metaData:
- *   Any metadat. This is typically ignore by Airavata and is used by gateways for application
configuration.
- * 
- */
-class OutputDataObjectType {
-  static $_TSPEC;
-
-  /**
-   * @var string
-   */
-  public $name = null;
-  /**
-   * @var string
-   */
-  public $value = null;
-  /**
-   * @var int
-   */
-  public $type = null;
-  /**
-   * @var string
-   */
-  public $applicationArgument = null;
-  /**
-   * @var bool
-   */
-  public $isRequired = null;
-  /**
-   * @var bool
-   */
-  public $requiredToAddedToCommandLine = null;
-  /**
-   * @var bool
-   */
-  public $dataMovement = null;
-  /**
-   * @var string
-   */
-  public $location = null;
-  /**
-   * @var string
-   */
-  public $searchQuery = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'name',
-          'type' => TType::STRING,
-          ),
-        2 => array(
-          'var' => 'value',
-          'type' => TType::STRING,
-          ),
-        3 => array(
-          'var' => 'type',
-          'type' => TType::I32,
-          ),
-        4 => array(
-          'var' => 'applicationArgument',
-          'type' => TType::STRING,
-          ),
-        5 => array(
-          'var' => 'isRequired',
-          'type' => TType::BOOL,
-          ),
-        6 => array(
-          'var' => 'requiredToAddedToCommandLine',
-          'type' => TType::BOOL,
-          ),
-        7 => array(
-          'var' => 'dataMovement',
-          'type' => TType::BOOL,
-          ),
-        8 => array(
-          'var' => 'location',
-          'type' => TType::STRING,
-          ),
-        9 => array(
-          'var' => 'searchQuery',
-          'type' => TType::STRING,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['name'])) {
-        $this->name = $vals['name'];
-      }
-      if (isset($vals['value'])) {
-        $this->value = $vals['value'];
-      }
-      if (isset($vals['type'])) {
-        $this->type = $vals['type'];
-      }
-      if (isset($vals['applicationArgument'])) {
-        $this->applicationArgument = $vals['applicationArgument'];
-      }
-      if (isset($vals['isRequired'])) {
-        $this->isRequired = $vals['isRequired'];
-      }
-      if (isset($vals['requiredToAddedToCommandLine'])) {
-        $this->requiredToAddedToCommandLine = $vals['requiredToAddedToCommandLine'];
-      }
-      if (isset($vals['dataMovement'])) {
-        $this->dataMovement = $vals['dataMovement'];
-      }
-      if (isset($vals['location'])) {
-        $this->location = $vals['location'];
-      }
-      if (isset($vals['searchQuery'])) {
-        $this->searchQuery = $vals['searchQuery'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'OutputDataObjectType';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->name);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 2:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->value);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->type);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 4:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->applicationArgument);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 5:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->isRequired);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 6:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->requiredToAddedToCommandLine);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 7:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->dataMovement);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 8:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->location);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 9:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->searchQuery);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('OutputDataObjectType');
-    if ($this->name !== null) {
-      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
-      $xfer += $output->writeString($this->name);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->value !== null) {
-      $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
-      $xfer += $output->writeString($this->value);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->type !== null) {
-      $xfer += $output->writeFieldBegin('type', TType::I32, 3);
-      $xfer += $output->writeI32($this->type);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->applicationArgument !== null) {
-      $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 4);
-      $xfer += $output->writeString($this->applicationArgument);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->isRequired !== null) {
-      $xfer += $output->writeFieldBegin('isRequired', TType::BOOL, 5);
-      $xfer += $output->writeBool($this->isRequired);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->requiredToAddedToCommandLine !== null) {
-      $xfer += $output->writeFieldBegin('requiredToAddedToCommandLine', TType::BOOL, 6);
-      $xfer += $output->writeBool($this->requiredToAddedToCommandLine);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->dataMovement !== null) {
-      $xfer += $output->writeFieldBegin('dataMovement', TType::BOOL, 7);
-      $xfer += $output->writeBool($this->dataMovement);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->location !== null) {
-      $xfer += $output->writeFieldBegin('location', TType::STRING, 8);
-      $xfer += $output->writeString($this->location);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->searchQuery !== null) {
-      $xfer += $output->writeFieldBegin('searchQuery', TType::STRING, 9);
-      $xfer += $output->writeString($this->searchQuery);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-/**
  * Application Interface Description
  * 
  * applicationModules:
@@ -687,11 +50,11 @@ class ApplicationInterfaceDescription {
    */
   public $applicationModules = null;
   /**
-   * @var \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType[]
+   * @var \Airavata\Model\Application\Io\InputDataObjectType[]
    */
   public $applicationInputs = null;
   /**
-   * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+   * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
    */
   public $applicationOutputs = null;
 
@@ -724,7 +87,7 @@ class ApplicationInterfaceDescription {
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType',
+            'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
             ),
           ),
         6 => array(
@@ -733,7 +96,7 @@ class ApplicationInterfaceDescription {
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+            'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
             ),
           ),
         );
@@ -826,7 +189,7 @@ class ApplicationInterfaceDescription {
             for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
             {
               $elem11 = null;
-              $elem11 = new \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType();
+              $elem11 = new \Airavata\Model\Application\Io\InputDataObjectType();
               $xfer += $elem11->read($input);
               $this->applicationInputs []= $elem11;
             }
@@ -844,7 +207,7 @@ class ApplicationInterfaceDescription {
             for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
             {
               $elem17 = null;
-              $elem17 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+              $elem17 = new \Airavata\Model\Application\Io\OutputDataObjectType();
               $xfer += $elem17->read($input);
               $this->applicationOutputs []= $elem17;
             }

http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
index 1602ceb..c1280f2 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
@@ -33,7 +33,7 @@ final class MessageLevel {
 final class MessageType {
   const EXPERIMENT = 0;
   const TASK = 1;
-  const WORKFLOWNODE = 2;
+  const PROCESS = 2;
   const JOB = 3;
   const LAUNCHTASK = 4;
   const TERMINATETASK = 5;
@@ -41,7 +41,7 @@ final class MessageType {
   static public $__names = array(
     0 => 'EXPERIMENT',
     1 => 'TASK',
-    2 => 'WORKFLOWNODE',
+    2 => 'PROCESS',
     3 => 'JOB',
     4 => 'LAUNCHTASK',
     5 => 'TERMINATETASK',
@@ -170,13 +170,13 @@ class ExperimentStatusChangeEvent {
 
 }
 
-class WorkflowIdentifier {
+class ProcessIdentifier {
   static $_TSPEC;
 
   /**
    * @var string
    */
-  public $workflowNodeId = null;
+  public $processId = null;
   /**
    * @var string
    */
@@ -190,7 +190,7 @@ class WorkflowIdentifier {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'workflowNodeId',
+          'var' => 'processId',
           'type' => TType::STRING,
           ),
         2 => array(
@@ -204,8 +204,8 @@ class WorkflowIdentifier {
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['workflowNodeId'])) {
-        $this->workflowNodeId = $vals['workflowNodeId'];
+      if (isset($vals['processId'])) {
+        $this->processId = $vals['processId'];
       }
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
@@ -217,7 +217,7 @@ class WorkflowIdentifier {
   }
 
   public function getName() {
-    return 'WorkflowIdentifier';
+    return 'ProcessIdentifier';
   }
 
   public function read($input)
@@ -237,7 +237,7 @@ class WorkflowIdentifier {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->workflowNodeId);
+            $xfer += $input->readString($this->processId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -268,10 +268,10 @@ class WorkflowIdentifier {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('WorkflowIdentifier');
-    if ($this->workflowNodeId !== null) {
-      $xfer += $output->writeFieldBegin('workflowNodeId', TType::STRING, 1);
-      $xfer += $output->writeString($this->workflowNodeId);
+    $xfer += $output->writeStructBegin('ProcessIdentifier');
+    if ($this->processId !== null) {
+      $xfer += $output->writeFieldBegin('processId', TType::STRING, 1);
+      $xfer += $output->writeString($this->processId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->experimentId !== null) {
@@ -291,109 +291,6 @@ class WorkflowIdentifier {
 
 }
 
-class WorkflowNodeStatusChangeEvent {
-  static $_TSPEC;
-
-  /**
-   * @var int
-   */
-  public $state = null;
-  /**
-   * @var \Airavata\Model\Messaging\Event\WorkflowIdentifier
-   */
-  public $workflowNodeIdentity = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'state',
-          'type' => TType::I32,
-          ),
-        2 => array(
-          'var' => 'workflowNodeIdentity',
-          'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\Messaging\Event\WorkflowIdentifier',
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['state'])) {
-        $this->state = $vals['state'];
-      }
-      if (isset($vals['workflowNodeIdentity'])) {
-        $this->workflowNodeIdentity = $vals['workflowNodeIdentity'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'WorkflowNodeStatusChangeEvent';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->state);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 2:
-          if ($ftype == TType::STRUCT) {
-            $this->workflowNodeIdentity = new \Airavata\Model\Messaging\Event\WorkflowIdentifier();
-            $xfer += $this->workflowNodeIdentity->read($input);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('WorkflowNodeStatusChangeEvent');
-    if ($this->state !== null) {
-      $xfer += $output->writeFieldBegin('state', TType::I32, 1);
-      $xfer += $output->writeI32($this->state);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->workflowNodeIdentity !== null) {
-      if (!is_object($this->workflowNodeIdentity)) {
-        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
-      }
-      $xfer += $output->writeFieldBegin('workflowNodeIdentity', TType::STRUCT, 2);
-      $xfer += $this->workflowNodeIdentity->write($output);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
 class TaskIdentifier {
   static $_TSPEC;
 
@@ -404,7 +301,7 @@ class TaskIdentifier {
   /**
    * @var string
    */
-  public $workflowNodeId = null;
+  public $processId = null;
   /**
    * @var string
    */
@@ -422,7 +319,7 @@ class TaskIdentifier {
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'workflowNodeId',
+          'var' => 'processId',
           'type' => TType::STRING,
           ),
         3 => array(
@@ -439,8 +336,8 @@ class TaskIdentifier {
       if (isset($vals['taskId'])) {
         $this->taskId = $vals['taskId'];
       }
-      if (isset($vals['workflowNodeId'])) {
-        $this->workflowNodeId = $vals['workflowNodeId'];
+      if (isset($vals['processId'])) {
+        $this->processId = $vals['processId'];
       }
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
@@ -479,7 +376,7 @@ class TaskIdentifier {
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->workflowNodeId);
+            $xfer += $input->readString($this->processId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -516,9 +413,9 @@ class TaskIdentifier {
       $xfer += $output->writeString($this->taskId);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->workflowNodeId !== null) {
-      $xfer += $output->writeFieldBegin('workflowNodeId', TType::STRING, 2);
-      $xfer += $output->writeString($this->workflowNodeId);
+    if ($this->processId !== null) {
+      $xfer += $output->writeFieldBegin('processId', TType::STRING, 2);
+      $xfer += $output->writeString($this->processId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->experimentId !== null) {
@@ -744,11 +641,217 @@ class TaskStatusChangeRequestEvent {
 
 }
 
+class ProcessStatusChangeEvent {
+  static $_TSPEC;
+
+  /**
+   * @var int
+   */
+  public $state = null;
+  /**
+   * @var \Airavata\Model\Messaging\Event\ProcessIdentifier
+   */
+  public $processIdentity = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'state',
+          'type' => TType::I32,
+          ),
+        2 => array(
+          'var' => 'processIdentity',
+          'type' => TType::STRUCT,
+          'class' => '\Airavata\Model\Messaging\Event\ProcessIdentifier',
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['state'])) {
+        $this->state = $vals['state'];
+      }
+      if (isset($vals['processIdentity'])) {
+        $this->processIdentity = $vals['processIdentity'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'ProcessStatusChangeEvent';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->state);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRUCT) {
+            $this->processIdentity = new \Airavata\Model\Messaging\Event\ProcessIdentifier();
+            $xfer += $this->processIdentity->read($input);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('ProcessStatusChangeEvent');
+    if ($this->state !== null) {
+      $xfer += $output->writeFieldBegin('state', TType::I32, 1);
+      $xfer += $output->writeI32($this->state);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->processIdentity !== null) {
+      if (!is_object($this->processIdentity)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('processIdentity', TType::STRUCT, 2);
+      $xfer += $this->processIdentity->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class ProcessStatusChangeRequestEvent {
+  static $_TSPEC;
+
+  /**
+   * @var int
+   */
+  public $state = null;
+  /**
+   * @var \Airavata\Model\Messaging\Event\ProcessIdentifier
+   */
+  public $processIdentity = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'state',
+          'type' => TType::I32,
+          ),
+        2 => array(
+          'var' => 'processIdentity',
+          'type' => TType::STRUCT,
+          'class' => '\Airavata\Model\Messaging\Event\ProcessIdentifier',
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['state'])) {
+        $this->state = $vals['state'];
+      }
+      if (isset($vals['processIdentity'])) {
+        $this->processIdentity = $vals['processIdentity'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'ProcessStatusChangeRequestEvent';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->state);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRUCT) {
+            $this->processIdentity = new \Airavata\Model\Messaging\Event\ProcessIdentifier();
+            $xfer += $this->processIdentity->read($input);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('ProcessStatusChangeRequestEvent');
+    if ($this->state !== null) {
+      $xfer += $output->writeFieldBegin('state', TType::I32, 1);
+      $xfer += $output->writeI32($this->state);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->processIdentity !== null) {
+      if (!is_object($this->processIdentity)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('processIdentity', TType::STRUCT, 2);
+      $xfer += $this->processIdentity->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
 class TaskOutputChangeEvent {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+   * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
    */
   public $output = null;
   /**
@@ -765,7 +868,7 @@ class TaskOutputChangeEvent {
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+            'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
             ),
           ),
         2 => array(
@@ -813,7 +916,7 @@ class TaskOutputChangeEvent {
             for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
             {
               $elem5 = null;
-              $elem5 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+              $elem5 = new \Airavata\Model\Application\Io\OutputDataObjectType();
               $xfer += $elem5->read($input);
               $this->output []= $elem5;
             }
@@ -889,7 +992,7 @@ class JobIdentifier {
   /**
    * @var string
    */
-  public $workflowNodeId = null;
+  public $processId = null;
   /**
    * @var string
    */
@@ -911,7 +1014,7 @@ class JobIdentifier {
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'workflowNodeId',
+          'var' => 'processId',
           'type' => TType::STRING,
           ),
         4 => array(
@@ -931,8 +1034,8 @@ class JobIdentifier {
       if (isset($vals['taskId'])) {
         $this->taskId = $vals['taskId'];
       }
-      if (isset($vals['workflowNodeId'])) {
-        $this->workflowNodeId = $vals['workflowNodeId'];
+      if (isset($vals['processId'])) {
+        $this->processId = $vals['processId'];
       }
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
@@ -978,7 +1081,7 @@ class JobIdentifier {
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->workflowNodeId);
+            $xfer += $input->readString($this->processId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -1020,9 +1123,9 @@ class JobIdentifier {
       $xfer += $output->writeString($this->taskId);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->workflowNodeId !== null) {
-      $xfer += $output->writeFieldBegin('workflowNodeId', TType::STRING, 3);
-      $xfer += $output->writeString($this->workflowNodeId);
+    if ($this->processId !== null) {
+      $xfer += $output->writeFieldBegin('processId', TType::STRING, 3);
+      $xfer += $output->writeString($this->processId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->experimentId !== null) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
index 15ba747..21d877c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
@@ -37,11 +37,11 @@ class Workflow {
    */
   public $image = null;
   /**
-   * @var \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType[]
+   * @var \Airavata\Model\Application\Io\InputDataObjectType[]
    */
   public $workflowInputs = null;
   /**
-   * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+   * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
    */
   public $workflowOutputs = null;
 
@@ -70,7 +70,7 @@ class Workflow {
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType',
+            'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
             ),
           ),
         6 => array(
@@ -79,7 +79,7 @@ class Workflow {
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+            'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
             ),
           ),
         );
@@ -162,7 +162,7 @@ class Workflow {
             for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
             {
               $elem5 = null;
-              $elem5 = new \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType();
+              $elem5 = new \Airavata\Model\Application\Io\InputDataObjectType();
               $xfer += $elem5->read($input);
               $this->workflowInputs []= $elem5;
             }
@@ -180,7 +180,7 @@ class Workflow {
             for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
             {
               $elem11 = null;
-              $elem11 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+              $elem11 = new \Airavata\Model\Application\Io\OutputDataObjectType();
               $xfer += $elem11->read($input);
               $this->workflowOutputs []= $elem11;
             }

http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
index d44ae02..458f6ea 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
@@ -121,7 +121,7 @@ class Project {
   /**
    * @var string
    */
-  public $projectID = "DEFAULT";
+  public $projectID = null;
   /**
    * @var string
    */

http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 32e03f8..057b583 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -60,11 +60,11 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print('   getAllExperimentsInProjectWithPagination(string projectId, i32 limit, i32 offset)')
   print('   getAllUserExperiments(string gatewayId, string userName)')
   print('   getAllUserExperimentsWithPagination(string gatewayId, string userName, i32 limit,
i32 offset)')
-  print('  string createExperiment(string gatewayId, Experiment experiment)')
-  print('  Experiment getExperiment(string airavataExperimentId)')
-  print('  void updateExperiment(string airavataExperimentId, Experiment experiment)')
-  print('  void updateExperimentConfiguration(string airavataExperimentId, UserConfigurationData
userConfiguration)')
-  print('  void updateResourceScheduleing(string airavataExperimentId, ComputationalResourceScheduling
resourceScheduling)')
+  print('  string createExperiment(string gatewayId, ExperimentModel experiment)')
+  print('  ExperimentModel getExperiment(string airavataExperimentId)')
+  print('  void updateExperiment(string airavataExperimentId, ExperimentModel experiment)')
+  print('  void updateExperimentConfiguration(string airavataExperimentId, UserConfigurationDataModel
userConfiguration)')
+  print('  void updateResourceScheduleing(string airavataExperimentId, ComputationalResourceSchedulingModel
resourceScheduling)')
   print('  bool validateExperiment(string airavataExperimentId)')
   print('  void launchExperiment(string airavataExperimentId, string airavataCredStoreToken)')
   print('  ExperimentStatus getExperimentStatus(string airavataExperimentId)')
@@ -72,7 +72,6 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print('   getIntermediateOutputs(string airavataExperimentId)')
   print('   getJobStatuses(string airavataExperimentId)')
   print('   getJobDetails(string airavataExperimentId)')
-  print('   getDataTransferDetails(string airavataExperimentId)')
   print('  string cloneExperiment(string existingExperimentID, string newExperimentName)')
   print('  void terminateExperiment(string airavataExperimentId, string tokenId)')
   print('  string registerApplicationModule(string gatewayId, ApplicationModule applicationModule)')
@@ -496,12 +495,6 @@ elif cmd == 'getJobDetails':
     sys.exit(1)
   pp.pprint(client.getJobDetails(args[0],))
 
-elif cmd == 'getDataTransferDetails':
-  if len(args) != 1:
-    print('getDataTransferDetails requires 1 args')
-    sys.exit(1)
-  pp.pprint(client.getDataTransferDetails(args[0],))
-
 elif cmd == 'cloneExperiment':
   if len(args) != 2:
     print('cloneExperiment requires 2 args')


Mime
View raw message