airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [1/2] git commit: Fixing a typo
Date Sun, 06 Jul 2014 04:32:04 GMT
Repository: airavata
Updated Branches:
  refs/heads/master e13ea8291 -> 4ccab010c


Fixing a typo


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

Branch: refs/heads/master
Commit: 9d5f017086f716713f44927c5be878a7c2bfb85f
Parents: 268dd34
Author: Suresh Marru <smarru@apache.org>
Authored: Sun Jul 6 00:31:45 2014 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Sun Jul 6 00:31:45 2014 -0400

----------------------------------------------------------------------
 .../lib/computeResourceModel_types.cpp          |  18 +--
 .../resources/lib/computeResourceModel_types.h  |  16 +--
 .../Model/AppCatalog/ComputeResource/Types.php  |  22 +--
 .../ComputeResourceDescription.java             | 134 +++++++++----------
 .../computeresource/GridFTPDataMovement.java    |   2 +-
 .../computeresource/JobSubmissionProtocol.java  |   2 +-
 .../computeresource/LOCALSubmission.java        |   2 +-
 .../computeresource/SCPDataMovement.java        |   2 +-
 .../computeresource/SSHJobSubmission.java       |   2 +-
 .../computeResourceModel.thrift                 |  12 +-
 10 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
index a473012..1d4f065 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
@@ -1373,19 +1373,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
       case 10:
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
-            this->dataMovemenetInterfaces.clear();
+            this->dataMovementInterfaces.clear();
             uint32_t _size58;
             ::apache::thrift::protocol::TType _etype61;
             xfer += iprot->readListBegin(_etype61, _size58);
-            this->dataMovemenetInterfaces.resize(_size58);
+            this->dataMovementInterfaces.resize(_size58);
             uint32_t _i62;
             for (_i62 = 0; _i62 < _size58; ++_i62)
             {
-              xfer += this->dataMovemenetInterfaces[_i62].read(iprot);
+              xfer += this->dataMovementInterfaces[_i62].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
-          this->__isset.dataMovemenetInterfaces = true;
+          this->__isset.dataMovementInterfaces = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -1495,12 +1495,12 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
     }
     xfer += oprot->writeFieldEnd();
   }
-  if (this->__isset.dataMovemenetInterfaces) {
-    xfer += oprot->writeFieldBegin("dataMovemenetInterfaces", ::apache::thrift::protocol::T_LIST,
10);
+  if (this->__isset.dataMovementInterfaces) {
+    xfer += oprot->writeFieldBegin("dataMovementInterfaces", ::apache::thrift::protocol::T_LIST,
10);
     {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataMovemenetInterfaces.size()));
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataMovementInterfaces.size()));
       std::vector<DataMovementInterface> ::const_iterator _iter68;
-      for (_iter68 = this->dataMovemenetInterfaces.begin(); _iter68 != this->dataMovemenetInterfaces.end();
++_iter68)
+      for (_iter68 = this->dataMovementInterfaces.begin(); _iter68 != this->dataMovementInterfaces.end();
++_iter68)
       {
         xfer += (*_iter68).write(oprot);
       }
@@ -1524,7 +1524,7 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription
&b) {
   swap(a.batchQueues, b.batchQueues);
   swap(a.fileSystems, b.fileSystems);
   swap(a.jobSubmissionInterfaces, b.jobSubmissionInterfaces);
-  swap(a.dataMovemenetInterfaces, b.dataMovemenetInterfaces);
+  swap(a.dataMovementInterfaces, b.dataMovementInterfaces);
   swap(a.__isset, b.__isset);
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
index 41c7b8f..c57bb1d 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
@@ -712,14 +712,14 @@ class DataMovementInterface {
 void swap(DataMovementInterface &a, DataMovementInterface &b);
 
 typedef struct _ComputeResourceDescription__isset {
-  _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false),
batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovemenetInterfaces(false)
{}
+  _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false),
batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false)
{}
   bool hostAliases;
   bool ipAddresses;
   bool resourceDescription;
   bool batchQueues;
   bool fileSystems;
   bool jobSubmissionInterfaces;
-  bool dataMovemenetInterfaces;
+  bool dataMovementInterfaces;
 } _ComputeResourceDescription__isset;
 
 class ComputeResourceDescription {
@@ -742,7 +742,7 @@ class ComputeResourceDescription {
   std::vector<BatchQueue>  batchQueues;
   std::map<FileSystems::type, std::string>  fileSystems;
   std::vector<JobSubmissionInterface>  jobSubmissionInterfaces;
-  std::vector<DataMovementInterface>  dataMovemenetInterfaces;
+  std::vector<DataMovementInterface>  dataMovementInterfaces;
 
   _ComputeResourceDescription__isset __isset;
 
@@ -788,9 +788,9 @@ class ComputeResourceDescription {
     __isset.jobSubmissionInterfaces = true;
   }
 
-  void __set_dataMovemenetInterfaces(const std::vector<DataMovementInterface> &
val) {
-    dataMovemenetInterfaces = val;
-    __isset.dataMovemenetInterfaces = true;
+  void __set_dataMovementInterfaces(const std::vector<DataMovementInterface> &
val) {
+    dataMovementInterfaces = val;
+    __isset.dataMovementInterfaces = true;
   }
 
   bool operator == (const ComputeResourceDescription & rhs) const
@@ -825,9 +825,9 @@ class ComputeResourceDescription {
       return false;
     else if (__isset.jobSubmissionInterfaces && !(jobSubmissionInterfaces == rhs.jobSubmissionInterfaces))
       return false;
-    if (__isset.dataMovemenetInterfaces != rhs.__isset.dataMovemenetInterfaces)
+    if (__isset.dataMovementInterfaces != rhs.__isset.dataMovementInterfaces)
       return false;
-    else if (__isset.dataMovemenetInterfaces && !(dataMovemenetInterfaces == rhs.dataMovemenetInterfaces))
+    else if (__isset.dataMovementInterfaces && !(dataMovementInterfaces == rhs.dataMovementInterfaces))
       return false;
     return true;
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index b4666f7..338688c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1435,7 +1435,7 @@ class ComputeResourceDescription {
   public $batchQueues = null;
   public $fileSystems = null;
   public $jobSubmissionInterfaces = null;
-  public $dataMovemenetInterfaces = null;
+  public $dataMovementInterfaces = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -1503,7 +1503,7 @@ class ComputeResourceDescription {
             ),
           ),
         10 => array(
-          'var' => 'dataMovemenetInterfaces',
+          'var' => 'dataMovementInterfaces',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
@@ -1541,8 +1541,8 @@ class ComputeResourceDescription {
       if (isset($vals['jobSubmissionInterfaces'])) {
         $this->jobSubmissionInterfaces = $vals['jobSubmissionInterfaces'];
       }
-      if (isset($vals['dataMovemenetInterfaces'])) {
-        $this->dataMovemenetInterfaces = $vals['dataMovemenetInterfaces'];
+      if (isset($vals['dataMovementInterfaces'])) {
+        $this->dataMovementInterfaces = $vals['dataMovementInterfaces'];
       }
     }
   }
@@ -1694,7 +1694,7 @@ class ComputeResourceDescription {
           break;
         case 10:
           if ($ftype == TType::LST) {
-            $this->dataMovemenetInterfaces = array();
+            $this->dataMovementInterfaces = array();
             $_size54 = 0;
             $_etype57 = 0;
             $xfer += $input->readListBegin($_etype57, $_size54);
@@ -1703,7 +1703,7 @@ class ComputeResourceDescription {
               $elem59 = null;
               $elem59 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
               $xfer += $elem59->read($input);
-              $this->dataMovemenetInterfaces []= $elem59;
+              $this->dataMovementInterfaces []= $elem59;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -1837,15 +1837,15 @@ class ComputeResourceDescription {
       }
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->dataMovemenetInterfaces !== null) {
-      if (!is_array($this->dataMovemenetInterfaces)) {
+    if ($this->dataMovementInterfaces !== null) {
+      if (!is_array($this->dataMovementInterfaces)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('dataMovemenetInterfaces', TType::LST, 10);
+      $xfer += $output->writeFieldBegin('dataMovementInterfaces', TType::LST, 10);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->dataMovemenetInterfaces));
+        $output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces));
         {
-          foreach ($this->dataMovemenetInterfaces as $iter68)
+          foreach ($this->dataMovementInterfaces as $iter68)
           {
             $xfer += $iter68->write($output);
           }

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index f1a75ae..bc2af43 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -89,7 +89,7 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField BATCH_QUEUES_FIELD_DESC = new org.apache.thrift.protocol.TField("batchQueues",
org.apache.thrift.protocol.TType.LIST, (short)7);
   private static final org.apache.thrift.protocol.TField FILE_SYSTEMS_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystems",
org.apache.thrift.protocol.TType.MAP, (short)8);
   private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACES_FIELD_DESC
= new org.apache.thrift.protocol.TField("jobSubmissionInterfaces", org.apache.thrift.protocol.TType.LIST,
(short)9);
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMENET_INTERFACES_FIELD_DESC
= new org.apache.thrift.protocol.TField("dataMovemenetInterfaces", org.apache.thrift.protocol.TType.LIST,
(short)10);
+  private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACES_FIELD_DESC
= new org.apache.thrift.protocol.TField("dataMovementInterfaces", org.apache.thrift.protocol.TType.LIST,
(short)10);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes =
new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -106,7 +106,7 @@ import org.slf4j.LoggerFactory;
   private List<BatchQueue> batchQueues; // optional
   private Map<FileSystems,String> fileSystems; // optional
   private List<JobSubmissionInterface> jobSubmissionInterfaces; // optional
-  private List<DataMovementInterface> dataMovemenetInterfaces; // optional
+  private List<DataMovementInterface> dataMovementInterfaces; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
@@ -119,7 +119,7 @@ import org.slf4j.LoggerFactory;
     BATCH_QUEUES((short)7, "batchQueues"),
     FILE_SYSTEMS((short)8, "fileSystems"),
     JOB_SUBMISSION_INTERFACES((short)9, "jobSubmissionInterfaces"),
-    DATA_MOVEMENET_INTERFACES((short)10, "dataMovemenetInterfaces");
+    DATA_MOVEMENT_INTERFACES((short)10, "dataMovementInterfaces");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -152,8 +152,8 @@ import org.slf4j.LoggerFactory;
           return FILE_SYSTEMS;
         case 9: // JOB_SUBMISSION_INTERFACES
           return JOB_SUBMISSION_INTERFACES;
-        case 10: // DATA_MOVEMENET_INTERFACES
-          return DATA_MOVEMENET_INTERFACES;
+        case 10: // DATA_MOVEMENT_INTERFACES
+          return DATA_MOVEMENT_INTERFACES;
         default:
           return null;
       }
@@ -196,7 +196,7 @@ import org.slf4j.LoggerFactory;
   // isset id assignments
   private static final int __ISEMPTY_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENET_INTERFACES};
+  private _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -224,7 +224,7 @@ import org.slf4j.LoggerFactory;
     tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACES, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaces",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,

             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
JobSubmissionInterface.class))));
-    tmpMap.put(_Fields.DATA_MOVEMENET_INTERFACES, new org.apache.thrift.meta_data.FieldMetaData("dataMovemenetInterfaces",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACES, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaces",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,

             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
DataMovementInterface.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -302,12 +302,12 @@ import org.slf4j.LoggerFactory;
       }
       this.jobSubmissionInterfaces = __this__jobSubmissionInterfaces;
     }
-    if (other.isSetDataMovemenetInterfaces()) {
-      List<DataMovementInterface> __this__dataMovemenetInterfaces = new ArrayList<DataMovementInterface>(other.dataMovemenetInterfaces.size());
-      for (DataMovementInterface other_element : other.dataMovemenetInterfaces) {
-        __this__dataMovemenetInterfaces.add(new DataMovementInterface(other_element));
+    if (other.isSetDataMovementInterfaces()) {
+      List<DataMovementInterface> __this__dataMovementInterfaces = new ArrayList<DataMovementInterface>(other.dataMovementInterfaces.size());
+      for (DataMovementInterface other_element : other.dataMovementInterfaces) {
+        __this__dataMovementInterfaces.add(new DataMovementInterface(other_element));
       }
-      this.dataMovemenetInterfaces = __this__dataMovemenetInterfaces;
+      this.dataMovementInterfaces = __this__dataMovementInterfaces;
     }
   }
 
@@ -328,7 +328,7 @@ import org.slf4j.LoggerFactory;
     this.batchQueues = null;
     this.fileSystems = null;
     this.jobSubmissionInterfaces = null;
-    this.dataMovemenetInterfaces = null;
+    this.dataMovementInterfaces = null;
   }
 
   public boolean isIsEmpty() {
@@ -608,41 +608,41 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public int getDataMovemenetInterfacesSize() {
-    return (this.dataMovemenetInterfaces == null) ? 0 : this.dataMovemenetInterfaces.size();
+  public int getDataMovementInterfacesSize() {
+    return (this.dataMovementInterfaces == null) ? 0 : this.dataMovementInterfaces.size();
   }
 
-  public java.util.Iterator<DataMovementInterface> getDataMovemenetInterfacesIterator()
{
-    return (this.dataMovemenetInterfaces == null) ? null : this.dataMovemenetInterfaces.iterator();
+  public java.util.Iterator<DataMovementInterface> getDataMovementInterfacesIterator()
{
+    return (this.dataMovementInterfaces == null) ? null : this.dataMovementInterfaces.iterator();
   }
 
-  public void addToDataMovemenetInterfaces(DataMovementInterface elem) {
-    if (this.dataMovemenetInterfaces == null) {
-      this.dataMovemenetInterfaces = new ArrayList<DataMovementInterface>();
+  public void addToDataMovementInterfaces(DataMovementInterface elem) {
+    if (this.dataMovementInterfaces == null) {
+      this.dataMovementInterfaces = new ArrayList<DataMovementInterface>();
     }
-    this.dataMovemenetInterfaces.add(elem);
+    this.dataMovementInterfaces.add(elem);
   }
 
-  public List<DataMovementInterface> getDataMovemenetInterfaces() {
-    return this.dataMovemenetInterfaces;
+  public List<DataMovementInterface> getDataMovementInterfaces() {
+    return this.dataMovementInterfaces;
   }
 
-  public void setDataMovemenetInterfaces(List<DataMovementInterface> dataMovemenetInterfaces)
{
-    this.dataMovemenetInterfaces = dataMovemenetInterfaces;
+  public void setDataMovementInterfaces(List<DataMovementInterface> dataMovementInterfaces)
{
+    this.dataMovementInterfaces = dataMovementInterfaces;
   }
 
-  public void unsetDataMovemenetInterfaces() {
-    this.dataMovemenetInterfaces = null;
+  public void unsetDataMovementInterfaces() {
+    this.dataMovementInterfaces = null;
   }
 
-  /** Returns true if field dataMovemenetInterfaces is set (has been assigned a value) and
false otherwise */
-  public boolean isSetDataMovemenetInterfaces() {
-    return this.dataMovemenetInterfaces != null;
+  /** Returns true if field dataMovementInterfaces is set (has been assigned a value) and
false otherwise */
+  public boolean isSetDataMovementInterfaces() {
+    return this.dataMovementInterfaces != null;
   }
 
-  public void setDataMovemenetInterfacesIsSet(boolean value) {
+  public void setDataMovementInterfacesIsSet(boolean value) {
     if (!value) {
-      this.dataMovemenetInterfaces = null;
+      this.dataMovementInterfaces = null;
     }
   }
 
@@ -720,11 +720,11 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case DATA_MOVEMENET_INTERFACES:
+    case DATA_MOVEMENT_INTERFACES:
       if (value == null) {
-        unsetDataMovemenetInterfaces();
+        unsetDataMovementInterfaces();
       } else {
-        setDataMovemenetInterfaces((List<DataMovementInterface>)value);
+        setDataMovementInterfaces((List<DataMovementInterface>)value);
       }
       break;
 
@@ -760,8 +760,8 @@ import org.slf4j.LoggerFactory;
     case JOB_SUBMISSION_INTERFACES:
       return getJobSubmissionInterfaces();
 
-    case DATA_MOVEMENET_INTERFACES:
-      return getDataMovemenetInterfaces();
+    case DATA_MOVEMENT_INTERFACES:
+      return getDataMovementInterfaces();
 
     }
     throw new IllegalStateException();
@@ -792,8 +792,8 @@ import org.slf4j.LoggerFactory;
       return isSetFileSystems();
     case JOB_SUBMISSION_INTERFACES:
       return isSetJobSubmissionInterfaces();
-    case DATA_MOVEMENET_INTERFACES:
-      return isSetDataMovemenetInterfaces();
+    case DATA_MOVEMENT_INTERFACES:
+      return isSetDataMovementInterfaces();
     }
     throw new IllegalStateException();
   }
@@ -892,12 +892,12 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_dataMovemenetInterfaces = true && this.isSetDataMovemenetInterfaces();
-    boolean that_present_dataMovemenetInterfaces = true && that.isSetDataMovemenetInterfaces();
-    if (this_present_dataMovemenetInterfaces || that_present_dataMovemenetInterfaces) {
-      if (!(this_present_dataMovemenetInterfaces && that_present_dataMovemenetInterfaces))
+    boolean this_present_dataMovementInterfaces = true && this.isSetDataMovementInterfaces();
+    boolean that_present_dataMovementInterfaces = true && that.isSetDataMovementInterfaces();
+    if (this_present_dataMovementInterfaces || that_present_dataMovementInterfaces) {
+      if (!(this_present_dataMovementInterfaces && that_present_dataMovementInterfaces))
         return false;
-      if (!this.dataMovemenetInterfaces.equals(that.dataMovemenetInterfaces))
+      if (!this.dataMovementInterfaces.equals(that.dataMovementInterfaces))
         return false;
     }
 
@@ -1007,12 +1007,12 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDataMovemenetInterfaces()).compareTo(other.isSetDataMovemenetInterfaces());
+    lastComparison = Boolean.valueOf(isSetDataMovementInterfaces()).compareTo(other.isSetDataMovementInterfaces());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetDataMovemenetInterfaces()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovemenetInterfaces,
other.dataMovemenetInterfaces);
+    if (isSetDataMovementInterfaces()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaces,
other.dataMovementInterfaces);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1116,13 +1116,13 @@ import org.slf4j.LoggerFactory;
       }
       first = false;
     }
-    if (isSetDataMovemenetInterfaces()) {
+    if (isSetDataMovementInterfaces()) {
       if (!first) sb.append(", ");
-      sb.append("dataMovemenetInterfaces:");
-      if (this.dataMovemenetInterfaces == null) {
+      sb.append("dataMovementInterfaces:");
+      if (this.dataMovementInterfaces == null) {
         sb.append("null");
       } else {
-        sb.append(this.dataMovemenetInterfaces);
+        sb.append(this.dataMovementInterfaces);
       }
       first = false;
     }
@@ -1309,21 +1309,21 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 10: // DATA_MOVEMENET_INTERFACES
+          case 10: // DATA_MOVEMENT_INTERFACES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
-                struct.dataMovemenetInterfaces = new ArrayList<DataMovementInterface>(_list42.size);
+                struct.dataMovementInterfaces = new ArrayList<DataMovementInterface>(_list42.size);
                 for (int _i43 = 0; _i43 < _list42.size; ++_i43)
                 {
                   DataMovementInterface _elem44;
                   _elem44 = new DataMovementInterface();
                   _elem44.read(iprot);
-                  struct.dataMovemenetInterfaces.add(_elem44);
+                  struct.dataMovementInterfaces.add(_elem44);
                 }
                 iprot.readListEnd();
               }
-              struct.setDataMovemenetInterfacesIsSet(true);
+              struct.setDataMovementInterfacesIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1432,12 +1432,12 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldEnd();
         }
       }
-      if (struct.dataMovemenetInterfaces != null) {
-        if (struct.isSetDataMovemenetInterfaces()) {
-          oprot.writeFieldBegin(DATA_MOVEMENET_INTERFACES_FIELD_DESC);
+      if (struct.dataMovementInterfaces != null) {
+        if (struct.isSetDataMovementInterfaces()) {
+          oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACES_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.dataMovemenetInterfaces.size()));
-            for (DataMovementInterface _iter50 : struct.dataMovemenetInterfaces)
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.dataMovementInterfaces.size()));
+            for (DataMovementInterface _iter50 : struct.dataMovementInterfaces)
             {
               _iter50.write(oprot);
             }
@@ -1485,7 +1485,7 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetJobSubmissionInterfaces()) {
         optionals.set(5);
       }
-      if (struct.isSetDataMovemenetInterfaces()) {
+      if (struct.isSetDataMovementInterfaces()) {
         optionals.set(6);
       }
       oprot.writeBitSet(optionals, 7);
@@ -1538,10 +1538,10 @@ import org.slf4j.LoggerFactory;
           }
         }
       }
-      if (struct.isSetDataMovemenetInterfaces()) {
+      if (struct.isSetDataMovementInterfaces()) {
         {
-          oprot.writeI32(struct.dataMovemenetInterfaces.size());
-          for (DataMovementInterface _iter56 : struct.dataMovemenetInterfaces)
+          oprot.writeI32(struct.dataMovementInterfaces.size());
+          for (DataMovementInterface _iter56 : struct.dataMovementInterfaces)
           {
             _iter56.write(oprot);
           }
@@ -1635,16 +1635,16 @@ import org.slf4j.LoggerFactory;
       if (incoming.get(6)) {
         {
           org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
iprot.readI32());
-          struct.dataMovemenetInterfaces = new ArrayList<DataMovementInterface>(_list73.size);
+          struct.dataMovementInterfaces = new ArrayList<DataMovementInterface>(_list73.size);
           for (int _i74 = 0; _i74 < _list73.size; ++_i74)
           {
             DataMovementInterface _elem75;
             _elem75 = new DataMovementInterface();
             _elem75.read(iprot);
-            struct.dataMovemenetInterfaces.add(_elem75);
+            struct.dataMovementInterfaces.add(_elem75);
           }
         }
-        struct.setDataMovemenetInterfacesIsSet(true);
+        struct.setDataMovementInterfacesIsSet(true);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
index ce901f1..9f56fff 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  *  If the login to scp is different than the hostname itself, specify it here
  * 
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
  */
 @SuppressWarnings("all") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement,
GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
index d553aad..564ed63 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
 /**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance Computing
Clusters.
+ * Enumeration of Airavata supported Job Submission Mechanisms for High Performance Computing
Clusters.
  * 
  * SSH:
  *  Execute remote job submission commands using via secure shell protocol.

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index 6053c29..dc7f555 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  *  If the login to ssh is different than the hostname itself, specify it here
  * 
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
  */
 @SuppressWarnings("all") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
index 1ee0418..085a590 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  *  If the login to scp is different than the hostname itself, specify it here
  * 
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
  */
 @SuppressWarnings("all") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement,
SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index 7978822..35b9e19 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  *  If the login to ssh is different than the hostname itself, specify it here
  * 
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
  */
 @SuppressWarnings("all") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission,
SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");

http://git-wip-us.apache.org/repos/asf/airavata/blob/9d5f0170/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
index c2b59ec..9e43cdb 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
@@ -166,7 +166,7 @@ enum SecurityProtocol {
 }
 
 /**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance Computing
Clusters.
+ * Enumeration of Airavata supported Job Submission Mechanisms for High Performance Computing
Clusters.
  *
  * SSH:
  *  Execute remote job submission commands using via secure shell protocol.
@@ -216,7 +216,7 @@ enum DataMovementProtocol {
  *  If the login to scp is different than the hostname itself, specify it here
  *
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
 */
 struct SCPDataMovement {
     1: required string dataMovementInterfaceId = DEFAULT_ID,
@@ -232,7 +232,7 @@ struct SCPDataMovement {
  *  If the login to scp is different than the hostname itself, specify it here
  *
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
 */
 struct GridFTPDataMovement {
     1: required string dataMovementInterfaceId = DEFAULT_ID,
@@ -247,7 +247,7 @@ struct GridFTPDataMovement {
  *  If the login to ssh is different than the hostname itself, specify it here
  *
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
 */
 struct LOCALSubmission {
     1: required string jobSubmissionInterfaceId = DEFAULT_ID,
@@ -274,7 +274,7 @@ struct LOCALDataMovement {
  *  If the login to ssh is different than the hostname itself, specify it here
  *
  * sshPort:
- *  If a non-defualt port needs to used, specify it.
+ *  If a non-default port needs to used, specify it.
 */
 struct SSHJobSubmission {
     1: required string jobSubmissionInterfaceId = DEFAULT_ID,
@@ -361,5 +361,5 @@ struct ComputeResourceDescription {
     7: optional list<BatchQueue> batchQueues,
     8: optional map<FileSystems, string> fileSystems,
     9: optional list<JobSubmissionInterface> jobSubmissionInterfaces,
-    10: optional list<DataMovementInterface> dataMovemenetInterfaces
+    10: optional list<DataMovementInterface> dataMovementInterfaces
 }


Mime
View raw message