You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/06/07 15:54:57 UTC

[21/50] [abbrv] storm git commit: STORM-2882: thrift

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java b/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
index 8a7a931..1c0399d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
@@ -25,22 +25,22 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology");
-
-  private static final org.apache.thrift.protocol.TField SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("spouts", org.apache.thrift.protocol.TType.MAP, (short)1);
-  private static final org.apache.thrift.protocol.TField BOLTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bolts", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField STATE_SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spouts", org.apache.thrift.protocol.TType.MAP, (short)3);
-  private static final org.apache.thrift.protocol.TField WORKER_HOOKS_FIELD_DESC = new org.apache.thrift.protocol.TField("worker_hooks", org.apache.thrift.protocol.TType.LIST, (short)4);
-  private static final org.apache.thrift.protocol.TField DEPENDENCY_JARS_FIELD_DESC = new org.apache.thrift.protocol.TField("dependency_jars", org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField DEPENDENCY_ARTIFACTS_FIELD_DESC = new org.apache.thrift.protocol.TField("dependency_artifacts", org.apache.thrift.protocol.TType.LIST, (short)6);
-  private static final org.apache.thrift.protocol.TField STORM_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("storm_version", org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField JDK_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("jdk_version", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField COMPONENT_TO_SHARED_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("component_to_shared_memory", org.apache.thrift.protocol.TType.MAP, (short)9);
-  private static final org.apache.thrift.protocol.TField SHARED_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("shared_memory", org.apache.thrift.protocol.TType.MAP, (short)10);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StormTopologyStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StormTopologyTupleSchemeFactory();
+public class StormTopology implements org.apache.storm.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("StormTopology");
+
+  private static final org.apache.storm.thrift.protocol.TField SPOUTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("spouts", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField BOLTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bolts", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField STATE_SPOUTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("state_spouts", org.apache.storm.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField WORKER_HOOKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("worker_hooks", org.apache.storm.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField DEPENDENCY_JARS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("dependency_jars", org.apache.storm.thrift.protocol.TType.LIST, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField DEPENDENCY_ARTIFACTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("dependency_artifacts", org.apache.storm.thrift.protocol.TType.LIST, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField STORM_VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("storm_version", org.apache.storm.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField JDK_VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("jdk_version", org.apache.storm.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_TO_SHARED_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_to_shared_memory", org.apache.storm.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField SHARED_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("shared_memory", org.apache.storm.thrift.protocol.TType.MAP, (short)10);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StormTopologyStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StormTopologyTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,SpoutSpec> spouts; // required
   private java.util.Map<java.lang.String,Bolt> bolts; // required
@@ -54,7 +54,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
   private java.util.Map<java.lang.String,SharedMemory> shared_memory; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
     SPOUTS((short)1, "spouts"),
     BOLTS((short)2, "bolts"),
     STATE_SPOUTS((short)3, "state_spouts"),
@@ -140,45 +140,45 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.WORKER_HOOKS,_Fields.DEPENDENCY_JARS,_Fields.DEPENDENCY_ARTIFACTS,_Fields.STORM_VERSION,_Fields.JDK_VERSION,_Fields.COMPONENT_TO_SHARED_MEMORY,_Fields.SHARED_MEMORY};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.SPOUTS, new org.apache.thrift.meta_data.FieldMetaData("spouts", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SpoutSpec.class))));
-    tmpMap.put(_Fields.BOLTS, new org.apache.thrift.meta_data.FieldMetaData("bolts", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Bolt.class))));
-    tmpMap.put(_Fields.STATE_SPOUTS, new org.apache.thrift.meta_data.FieldMetaData("state_spouts", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StateSpoutSpec.class))));
-    tmpMap.put(_Fields.WORKER_HOOKS, new org.apache.thrift.meta_data.FieldMetaData("worker_hooks", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
-    tmpMap.put(_Fields.DEPENDENCY_JARS, new org.apache.thrift.meta_data.FieldMetaData("dependency_jars", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.DEPENDENCY_ARTIFACTS, new org.apache.thrift.meta_data.FieldMetaData("dependency_artifacts", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.STORM_VERSION, new org.apache.thrift.meta_data.FieldMetaData("storm_version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.JDK_VERSION, new org.apache.thrift.meta_data.FieldMetaData("jdk_version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMPONENT_TO_SHARED_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("component_to_shared_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))));
-    tmpMap.put(_Fields.SHARED_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("shared_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SharedMemory.class))));
+    java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.SPOUTS, new org.apache.storm.thrift.meta_data.FieldMetaData("spouts", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SpoutSpec.class))));
+    tmpMap.put(_Fields.BOLTS, new org.apache.storm.thrift.meta_data.FieldMetaData("bolts", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, Bolt.class))));
+    tmpMap.put(_Fields.STATE_SPOUTS, new org.apache.storm.thrift.meta_data.FieldMetaData("state_spouts", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, StateSpoutSpec.class))));
+    tmpMap.put(_Fields.WORKER_HOOKS, new org.apache.storm.thrift.meta_data.FieldMetaData("worker_hooks", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING            , true))));
+    tmpMap.put(_Fields.DEPENDENCY_JARS, new org.apache.storm.thrift.meta_data.FieldMetaData("dependency_jars", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.DEPENDENCY_ARTIFACTS, new org.apache.storm.thrift.meta_data.FieldMetaData("dependency_artifacts", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.STORM_VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("storm_version", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.JDK_VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("jdk_version", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.COMPONENT_TO_SHARED_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("component_to_shared_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING), 
+            new org.apache.storm.thrift.meta_data.SetMetaData(org.apache.storm.thrift.protocol.TType.SET, 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)))));
+    tmpMap.put(_Fields.SHARED_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("shared_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SharedMemory.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class, metaDataMap);
   }
 
   public StormTopology() {
@@ -962,7 +962,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_spouts()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spouts, other.spouts);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.spouts, other.spouts);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -972,7 +972,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_bolts()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolts, other.bolts);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.bolts, other.bolts);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -982,7 +982,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_state_spouts()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spouts, other.state_spouts);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.state_spouts, other.state_spouts);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -992,7 +992,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_worker_hooks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.worker_hooks, other.worker_hooks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.worker_hooks, other.worker_hooks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1002,7 +1002,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_dependency_jars()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dependency_jars, other.dependency_jars);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.dependency_jars, other.dependency_jars);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1012,7 +1012,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_dependency_artifacts()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dependency_artifacts, other.dependency_artifacts);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.dependency_artifacts, other.dependency_artifacts);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1022,7 +1022,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_storm_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storm_version, other.storm_version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.storm_version, other.storm_version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1032,7 +1032,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_jdk_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jdk_version, other.jdk_version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.jdk_version, other.jdk_version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1042,7 +1042,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_component_to_shared_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_to_shared_memory, other.component_to_shared_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_to_shared_memory, other.component_to_shared_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1052,7 +1052,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       return lastComparison;
     }
     if (is_set_shared_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shared_memory, other.shared_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.shared_memory, other.shared_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1064,11 +1064,11 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+  public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
 
@@ -1106,7 +1106,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       if (this.worker_hooks == null) {
         sb.append("null");
       } else {
-        org.apache.thrift.TBaseHelper.toString(this.worker_hooks, sb);
+        org.apache.storm.thrift.TBaseHelper.toString(this.worker_hooks, sb);
       }
       first = false;
     }
@@ -1174,18 +1174,18 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     if (!is_set_spouts()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'spouts' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'spouts' is unset! Struct:" + toString());
     }
 
     if (!is_set_bolts()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'bolts' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'bolts' is unset! Struct:" + toString());
     }
 
     if (!is_set_state_spouts()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1193,42 +1193,42 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
     try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
+      write(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.storm.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
+      read(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.storm.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
-  private static class StormTopologyStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StormTopologyStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StormTopologyStandardScheme getScheme() {
       return new StormTopologyStandardScheme();
     }
   }
 
-  private static class StormTopologyStandardScheme extends org.apache.thrift.scheme.StandardScheme<StormTopology> {
+  private static class StormTopologyStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<StormTopology> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, StormTopology struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, StormTopology struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.storm.thrift.protocol.TType.STOP) { 
           break;
         }
         switch (schemeField.id) {
           case 1: // SPOUTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map44 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map44 = iprot.readMapBegin();
                 struct.spouts = new java.util.HashMap<java.lang.String,SpoutSpec>(2*_map44.size);
                 java.lang.String _key45;
                 SpoutSpec _val46;
@@ -1243,13 +1243,13 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_spouts_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 2: // BOLTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map48 = iprot.readMapBegin();
                 struct.bolts = new java.util.HashMap<java.lang.String,Bolt>(2*_map48.size);
                 java.lang.String _key49;
                 Bolt _val50;
@@ -1264,13 +1264,13 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_bolts_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 3: // STATE_SPOUTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map52 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map52 = iprot.readMapBegin();
                 struct.state_spouts = new java.util.HashMap<java.lang.String,StateSpoutSpec>(2*_map52.size);
                 java.lang.String _key53;
                 StateSpoutSpec _val54;
@@ -1285,13 +1285,13 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_state_spouts_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 4: // WORKER_HOOKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list56 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list56 = iprot.readListBegin();
                 struct.worker_hooks = new java.util.ArrayList<java.nio.ByteBuffer>(_list56.size);
                 java.nio.ByteBuffer _elem57;
                 for (int _i58 = 0; _i58 < _list56.size; ++_i58)
@@ -1303,13 +1303,13 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_worker_hooks_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 5: // DEPENDENCY_JARS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list59 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list59 = iprot.readListBegin();
                 struct.dependency_jars = new java.util.ArrayList<java.lang.String>(_list59.size);
                 java.lang.String _elem60;
                 for (int _i61 = 0; _i61 < _list59.size; ++_i61)
@@ -1321,13 +1321,13 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_dependency_jars_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 6: // DEPENDENCY_ARTIFACTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list62 = iprot.readListBegin();
                 struct.dependency_artifacts = new java.util.ArrayList<java.lang.String>(_list62.size);
                 java.lang.String _elem63;
                 for (int _i64 = 0; _i64 < _list62.size; ++_i64)
@@ -1339,29 +1339,29 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_dependency_artifacts_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 7: // STORM_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.storm_version = iprot.readString();
               struct.set_storm_version_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 8: // JDK_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.jdk_version = iprot.readString();
               struct.set_jdk_version_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 9: // COMPONENT_TO_SHARED_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map65 = iprot.readMapBegin();
                 struct.component_to_shared_memory = new java.util.HashMap<java.lang.String,java.util.Set<java.lang.String>>(2*_map65.size);
                 java.lang.String _key66;
                 java.util.Set<java.lang.String> _val67;
@@ -1369,7 +1369,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
                 {
                   _key66 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TSet _set69 = iprot.readSetBegin();
+                    org.apache.storm.thrift.protocol.TSet _set69 = iprot.readSetBegin();
                     _val67 = new java.util.HashSet<java.lang.String>(2*_set69.size);
                     java.lang.String _elem70;
                     for (int _i71 = 0; _i71 < _set69.size; ++_i71)
@@ -1385,13 +1385,13 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_component_to_shared_memory_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 10: // SHARED_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map72 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map72 = iprot.readMapBegin();
                 struct.shared_memory = new java.util.HashMap<java.lang.String,SharedMemory>(2*_map72.size);
                 java.lang.String _key73;
                 SharedMemory _val74;
@@ -1406,11 +1406,11 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
               }
               struct.set_shared_memory_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
         iprot.readFieldEnd();
       }
@@ -1418,14 +1418,14 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, StormTopology struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, StormTopology struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.spouts != null) {
         oprot.writeFieldBegin(SPOUTS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.spouts.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, struct.spouts.size()));
           for (java.util.Map.Entry<java.lang.String, SpoutSpec> _iter76 : struct.spouts.entrySet())
           {
             oprot.writeString(_iter76.getKey());
@@ -1438,7 +1438,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       if (struct.bolts != null) {
         oprot.writeFieldBegin(BOLTS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.bolts.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, struct.bolts.size()));
           for (java.util.Map.Entry<java.lang.String, Bolt> _iter77 : struct.bolts.entrySet())
           {
             oprot.writeString(_iter77.getKey());
@@ -1451,7 +1451,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       if (struct.state_spouts != null) {
         oprot.writeFieldBegin(STATE_SPOUTS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.state_spouts.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, struct.state_spouts.size()));
           for (java.util.Map.Entry<java.lang.String, StateSpoutSpec> _iter78 : struct.state_spouts.entrySet())
           {
             oprot.writeString(_iter78.getKey());
@@ -1465,7 +1465,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
         if (struct.is_set_worker_hooks()) {
           oprot.writeFieldBegin(WORKER_HOOKS_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.worker_hooks.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.worker_hooks.size()));
             for (java.nio.ByteBuffer _iter79 : struct.worker_hooks)
             {
               oprot.writeBinary(_iter79);
@@ -1479,7 +1479,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
         if (struct.is_set_dependency_jars()) {
           oprot.writeFieldBegin(DEPENDENCY_JARS_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.dependency_jars.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.dependency_jars.size()));
             for (java.lang.String _iter80 : struct.dependency_jars)
             {
               oprot.writeString(_iter80);
@@ -1493,7 +1493,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
         if (struct.is_set_dependency_artifacts()) {
           oprot.writeFieldBegin(DEPENDENCY_ARTIFACTS_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.dependency_artifacts.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.dependency_artifacts.size()));
             for (java.lang.String _iter81 : struct.dependency_artifacts)
             {
               oprot.writeString(_iter81);
@@ -1521,12 +1521,12 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
         if (struct.is_set_component_to_shared_memory()) {
           oprot.writeFieldBegin(COMPONENT_TO_SHARED_MEMORY_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, struct.component_to_shared_memory.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.SET, struct.component_to_shared_memory.size()));
             for (java.util.Map.Entry<java.lang.String, java.util.Set<java.lang.String>> _iter82 : struct.component_to_shared_memory.entrySet())
             {
               oprot.writeString(_iter82.getKey());
               {
-                oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, _iter82.getValue().size()));
+                oprot.writeSetBegin(new org.apache.storm.thrift.protocol.TSet(org.apache.storm.thrift.protocol.TType.STRING, _iter82.getValue().size()));
                 for (java.lang.String _iter83 : _iter82.getValue())
                 {
                   oprot.writeString(_iter83);
@@ -1543,7 +1543,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
         if (struct.is_set_shared_memory()) {
           oprot.writeFieldBegin(SHARED_MEMORY_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.shared_memory.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, struct.shared_memory.size()));
             for (java.util.Map.Entry<java.lang.String, SharedMemory> _iter84 : struct.shared_memory.entrySet())
             {
               oprot.writeString(_iter84.getKey());
@@ -1560,17 +1560,17 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
 
   }
 
-  private static class StormTopologyTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StormTopologyTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StormTopologyTupleScheme getScheme() {
       return new StormTopologyTupleScheme();
     }
   }
 
-  private static class StormTopologyTupleScheme extends org.apache.thrift.scheme.TupleScheme<StormTopology> {
+  private static class StormTopologyTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<StormTopology> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+    public void write(org.apache.storm.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.spouts.size());
         for (java.util.Map.Entry<java.lang.String, SpoutSpec> _iter85 : struct.spouts.entrySet())
@@ -1680,10 +1680,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+    public void read(org.apache.storm.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TMap _map94 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map94 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.spouts = new java.util.HashMap<java.lang.String,SpoutSpec>(2*_map94.size);
         java.lang.String _key95;
         SpoutSpec _val96;
@@ -1697,7 +1697,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       }
       struct.set_spouts_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map98 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map98 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.bolts = new java.util.HashMap<java.lang.String,Bolt>(2*_map98.size);
         java.lang.String _key99;
         Bolt _val100;
@@ -1711,7 +1711,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       }
       struct.set_bolts_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map102 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.state_spouts = new java.util.HashMap<java.lang.String,StateSpoutSpec>(2*_map102.size);
         java.lang.String _key103;
         StateSpoutSpec _val104;
@@ -1727,7 +1727,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list106 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list106 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.worker_hooks = new java.util.ArrayList<java.nio.ByteBuffer>(_list106.size);
           java.nio.ByteBuffer _elem107;
           for (int _i108 = 0; _i108 < _list106.size; ++_i108)
@@ -1740,7 +1740,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list109 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list109 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.dependency_jars = new java.util.ArrayList<java.lang.String>(_list109.size);
           java.lang.String _elem110;
           for (int _i111 = 0; _i111 < _list109.size; ++_i111)
@@ -1753,7 +1753,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list112 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list112 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.dependency_artifacts = new java.util.ArrayList<java.lang.String>(_list112.size);
           java.lang.String _elem113;
           for (int _i114 = 0; _i114 < _list112.size; ++_i114)
@@ -1774,7 +1774,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TMap _map115 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map115 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.SET, iprot.readI32());
           struct.component_to_shared_memory = new java.util.HashMap<java.lang.String,java.util.Set<java.lang.String>>(2*_map115.size);
           java.lang.String _key116;
           java.util.Set<java.lang.String> _val117;
@@ -1782,7 +1782,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
           {
             _key116 = iprot.readString();
             {
-              org.apache.thrift.protocol.TSet _set119 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+              org.apache.storm.thrift.protocol.TSet _set119 = new org.apache.storm.thrift.protocol.TSet(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
               _val117 = new java.util.HashSet<java.lang.String>(2*_set119.size);
               java.lang.String _elem120;
               for (int _i121 = 0; _i121 < _set119.size; ++_i121)
@@ -1798,7 +1798,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TMap _map122 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map122 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.shared_memory = new java.util.HashMap<java.lang.String,SharedMemory>(2*_map122.size);
           java.lang.String _key123;
           SharedMemory _val124;
@@ -1815,8 +1815,8 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
     }
   }
 
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  private static <S extends org.apache.storm.thrift.scheme.IScheme> S scheme(org.apache.storm.thrift.protocol.TProtocol proto) {
+    return (org.apache.storm.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
   }
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java b/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
index 2f29b7c..c8a0fce 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StreamInfo.java
@@ -25,20 +25,20 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo");
+public class StreamInfo implements org.apache.storm.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("StreamInfo");
 
-  private static final org.apache.thrift.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("output_fields", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("direct", org.apache.thrift.protocol.TType.BOOL, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("output_fields", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField DIRECT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("direct", org.apache.storm.thrift.protocol.TType.BOOL, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StreamInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StreamInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StreamInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StreamInfoTupleSchemeFactory();
 
   private java.util.List<java.lang.String> output_fields; // required
   private boolean direct; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
     OUTPUT_FIELDS((short)1, "output_fields"),
     DIRECT((short)2, "direct");
 
@@ -101,16 +101,16 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
   // isset id assignments
   private static final int __DIRECT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.OUTPUT_FIELDS, new org.apache.thrift.meta_data.FieldMetaData("output_fields", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.DIRECT, new org.apache.thrift.meta_data.FieldMetaData("direct", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.OUTPUT_FIELDS, new org.apache.storm.thrift.meta_data.FieldMetaData("output_fields", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.DIRECT, new org.apache.storm.thrift.meta_data.FieldMetaData("direct", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.BOOL)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StreamInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StreamInfo.class, metaDataMap);
   }
 
   public StreamInfo() {
@@ -197,16 +197,16 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
   }
 
   public void unset_direct() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DIRECT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __DIRECT_ISSET_ID);
   }
 
   /** Returns true if field direct is set (has been assigned a value) and false otherwise */
   public boolean is_set_direct() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DIRECT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __DIRECT_ISSET_ID);
   }
 
   public void set_direct_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DIRECT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __DIRECT_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -319,7 +319,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
       return lastComparison;
     }
     if (is_set_output_fields()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.output_fields, other.output_fields);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.output_fields, other.output_fields);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -329,7 +329,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
       return lastComparison;
     }
     if (is_set_direct()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.direct, other.direct);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.direct, other.direct);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -341,11 +341,11 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+  public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
 
@@ -369,14 +369,14 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     if (!is_set_output_fields()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'output_fields' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'output_fields' is unset! Struct:" + toString());
     }
 
     if (!is_set_direct()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'direct' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'direct' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -384,8 +384,8 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
     try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
+      write(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.storm.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
@@ -394,34 +394,34 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
+      read(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.storm.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
-  private static class StreamInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StreamInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StreamInfoStandardScheme getScheme() {
       return new StreamInfoStandardScheme();
     }
   }
 
-  private static class StreamInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<StreamInfo> {
+  private static class StreamInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<StreamInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, StreamInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, StreamInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.storm.thrift.protocol.TType.STOP) { 
           break;
         }
         switch (schemeField.id) {
           case 1: // OUTPUT_FIELDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list16 = iprot.readListBegin();
                 struct.output_fields = new java.util.ArrayList<java.lang.String>(_list16.size);
                 java.lang.String _elem17;
                 for (int _i18 = 0; _i18 < _list16.size; ++_i18)
@@ -433,19 +433,19 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
               }
               struct.set_output_fields_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 2: // DIRECT
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.BOOL) {
               struct.direct = iprot.readBool();
               struct.set_direct_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
         iprot.readFieldEnd();
       }
@@ -453,14 +453,14 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, StreamInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, StreamInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.output_fields != null) {
         oprot.writeFieldBegin(OUTPUT_FIELDS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.output_fields.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.output_fields.size()));
           for (java.lang.String _iter19 : struct.output_fields)
           {
             oprot.writeString(_iter19);
@@ -478,17 +478,17 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
 
   }
 
-  private static class StreamInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StreamInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StreamInfoTupleScheme getScheme() {
       return new StreamInfoTupleScheme();
     }
   }
 
-  private static class StreamInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<StreamInfo> {
+  private static class StreamInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<StreamInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+    public void write(org.apache.storm.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.output_fields.size());
         for (java.lang.String _iter20 : struct.output_fields)
@@ -500,10 +500,10 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+    public void read(org.apache.storm.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list21 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
         struct.output_fields = new java.util.ArrayList<java.lang.String>(_list21.size);
         java.lang.String _elem22;
         for (int _i23 = 0; _i23 < _list21.size; ++_i23)
@@ -518,8 +518,8 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
     }
   }
 
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  private static <S extends org.apache.storm.thrift.scheme.IScheme> S scheme(org.apache.storm.thrift.protocol.TProtocol proto) {
+    return (org.apache.storm.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
   }
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java b/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
index 7471d79..4e5625a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SubmitOptions.java
@@ -25,20 +25,20 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions");
+public class SubmitOptions implements org.apache.storm.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SubmitOptions");
 
-  private static final org.apache.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("initial_status", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("initial_status", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("creds", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SubmitOptionsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SubmitOptionsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SubmitOptionsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SubmitOptionsTupleSchemeFactory();
 
   private TopologyInitialStatus initial_status; // required
   private Credentials creds; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
     /**
      * 
      * @see TopologyInitialStatus
@@ -104,15 +104,15 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.CREDS};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.INITIAL_STATUS, new org.apache.thrift.meta_data.FieldMetaData("initial_status", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TopologyInitialStatus.class)));
-    tmpMap.put(_Fields.CREDS, new org.apache.thrift.meta_data.FieldMetaData("creds", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Credentials.class)));
+    java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.INITIAL_STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("initial_status", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, TopologyInitialStatus.class)));
+    tmpMap.put(_Fields.CREDS, new org.apache.storm.thrift.meta_data.FieldMetaData("creds", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, Credentials.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SubmitOptions.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SubmitOptions.class, metaDataMap);
   }
 
   public SubmitOptions() {
@@ -313,7 +313,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
       return lastComparison;
     }
     if (is_set_initial_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.initial_status, other.initial_status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.initial_status, other.initial_status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -323,7 +323,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
       return lastComparison;
     }
     if (is_set_creds()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creds, other.creds);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.creds, other.creds);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -335,11 +335,11 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+  public void read(org.apache.storm.thrift.protocol.TProtocol iprot) throws org.apache.storm.thrift.TException {
     scheme(iprot).read(iprot, this);
   }
 
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  public void write(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     scheme(oprot).write(oprot, this);
   }
 
@@ -369,10 +369,10 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     if (!is_set_initial_status()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'initial_status' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'initial_status' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -383,57 +383,57 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
     try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
+      write(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.storm.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
+      read(new org.apache.storm.thrift.protocol.TCompactProtocol(new org.apache.storm.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.storm.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
-  private static class SubmitOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SubmitOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SubmitOptionsStandardScheme getScheme() {
       return new SubmitOptionsStandardScheme();
     }
   }
 
-  private static class SubmitOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SubmitOptions> {
+  private static class SubmitOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SubmitOptions> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SubmitOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SubmitOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TField schemeField;
       iprot.readStructBegin();
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.storm.thrift.protocol.TType.STOP) { 
           break;
         }
         switch (schemeField.id) {
           case 1: // INITIAL_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.initial_status = org.apache.storm.generated.TopologyInitialStatus.findByValue(iprot.readI32());
               struct.set_initial_status_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 2: // CREDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.creds = new Credentials();
               struct.creds.read(iprot);
               struct.set_creds_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
         iprot.readFieldEnd();
       }
@@ -441,7 +441,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SubmitOptions struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SubmitOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -463,17 +463,17 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
 
   }
 
-  private static class SubmitOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SubmitOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SubmitOptionsTupleScheme getScheme() {
       return new SubmitOptionsTupleScheme();
     }
   }
 
-  private static class SubmitOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<SubmitOptions> {
+  private static class SubmitOptionsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SubmitOptions> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+    public void write(org.apache.storm.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI32(struct.initial_status.getValue());
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_creds()) {
@@ -486,8 +486,8 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+    public void read(org.apache.storm.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.initial_status = org.apache.storm.generated.TopologyInitialStatus.findByValue(iprot.readI32());
       struct.set_initial_status_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(1);
@@ -499,8 +499,8 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
     }
   }
 
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  private static <S extends org.apache.storm.thrift.scheme.IScheme> S scheme(org.apache.storm.thrift.protocol.TProtocol proto) {
+    return (org.apache.storm.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
   }
 }