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:37 UTC

[01/50] [abbrv] storm git commit: STORM-2882: jctools

Repository: storm
Updated Branches:
  refs/heads/master 3e098f12e -> ab9768799


STORM-2882: jctools


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2a131771
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2a131771
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2a131771

Branch: refs/heads/master
Commit: 2a13177163ea1d0aef9bc9d3ba03007f1ab7c569
Parents: 62f9568
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue May 29 13:05:07 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:12 2018 -0500

----------------------------------------------------------------------
 examples/storm-perf/pom.xml                           |  4 ++++
 shaded-deps/pom.xml                                   | 14 ++++++++++++++
 storm-client/pom.xml                                  |  6 ------
 .../src/jvm/org/apache/storm/executor/Executor.java   |  2 +-
 .../src/jvm/org/apache/storm/utils/JCQueue.java       |  8 ++++----
 5 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2a131771/examples/storm-perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-perf/pom.xml b/examples/storm-perf/pom.xml
index 4bbabfa3..30ea04f 100644
--- a/examples/storm-perf/pom.xml
+++ b/examples/storm-perf/pom.xml
@@ -127,6 +127,10 @@
             <artifactId>kafka-clients</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jctools</groupId>
+            <artifactId>jctools-core</artifactId>
+        </dependency>
     </dependencies>
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/2a131771/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index f0e95ae..f472e51 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -85,6 +85,10 @@
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jctools</groupId>
+            <artifactId>jctools-core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -113,6 +117,7 @@
                             <include>commons-io:commons-io</include>
                             <include>commons-lang:commons-lang</include>
                             <include>commons-collections:commons-collections</include>
+                            <include>org.jctools:jctools-core</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -133,6 +138,11 @@
                             <shadedPattern>org.apache.storm.shade.org.apache.zookeeper</shadedPattern>
                         </relocation>
                         <relocation>
+                            <!--This is a part of zookeeper-->
+                            <pattern>org.apache.jute</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.apache.jute</shadedPattern>
+                        </relocation>
+                        <relocation>
                             <pattern>org.apache.commons.io</pattern>
                             <shadedPattern>org.apache.storm.shade.org.apache.commons.io</shadedPattern>
                         </relocation>
@@ -144,6 +154,10 @@
                             <pattern>org.apache.commons.collections</pattern>
                             <shadedPattern>org.apache.storm.shade.org.apache.commons.collections</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.jctools</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.jctools</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

http://git-wip-us.apache.org/repos/asf/storm/blob/2a131771/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 6310b2b..9e51de6 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -94,12 +94,6 @@
             </exclusions>
         </dependency>
 
-        <!-- jctools -->
-        <dependency>
-            <groupId>org.jctools</groupId>
-            <artifactId>jctools-core</artifactId>
-        </dependency>
-        
         <!-- JAXB -->
         <dependency>
             <groupId>javax.xml.bind</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/2a131771/storm-client/src/jvm/org/apache/storm/executor/Executor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/executor/Executor.java b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
index 2e22a9e..30ae0ca 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
@@ -57,6 +57,7 @@ import org.apache.storm.metric.api.IMetric;
 import org.apache.storm.metric.api.IMetricsConsumer;
 import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.shade.com.google.common.collect.Lists;
+import org.apache.storm.shade.org.jctools.queues.MpscChunkedArrayQueue;
 import org.apache.storm.stats.CommonStats;
 import org.apache.storm.stats.StatsUtil;
 import org.apache.storm.task.WorkerTopologyContext;
@@ -69,7 +70,6 @@ import org.apache.storm.utils.JCQueue;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.Time;
 import org.apache.storm.utils.Utils;
-import org.jctools.queues.MpscChunkedArrayQueue;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/storm/blob/2a131771/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
index 5d4eea7..207f1e0 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
@@ -30,9 +30,9 @@ import org.apache.storm.metrics2.JcMetrics;
 import org.apache.storm.metrics2.StormMetricRegistry;
 import org.apache.storm.policy.IWaitStrategy;
 import org.apache.storm.shade.com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpscArrayQueue;
-import org.jctools.queues.MpscUnboundedArrayQueue;
+import org.apache.storm.shade.org.jctools.queues.MessagePassingQueue;
+import org.apache.storm.shade.org.jctools.queues.MpscArrayQueue;
+import org.apache.storm.shade.org.jctools.queues.MpscUnboundedArrayQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -277,7 +277,7 @@ public class JCQueue implements IStatefulObject {
         boolean tryFlush();
     }
 
-    public interface Consumer extends org.jctools.queues.MessagePassingQueue.Consumer<Object> {
+    public interface Consumer extends MessagePassingQueue.Consumer<Object> {
         void accept(Object event);
 
         void flush() throws InterruptedException;


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

Posted by bo...@apache.org.
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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java b/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
index 0a7decd..0bf9545 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/KeyAlreadyExistsException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class KeyAlreadyExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<KeyAlreadyExistsException, KeyAlreadyExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyAlreadyExistsException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyAlreadyExistsException");
+public class KeyAlreadyExistsException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<KeyAlreadyExistsException, KeyAlreadyExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyAlreadyExistsException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("KeyAlreadyExistsException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KeyAlreadyExistsExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KeyAlreadyExistsExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KeyAlreadyExistsExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KeyAlreadyExistsExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KeyAlreadyExistsException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KeyAlreadyExistsException.class, metaDataMap);
   }
 
   public KeyAlreadyExistsException() {
@@ -240,7 +240,7 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
     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);
   }
 
@@ -276,10 +276,10 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
 
   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 KeyAlreadyExistsExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class KeyAlreadyExistsExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public KeyAlreadyExistsExceptionStandardScheme getScheme() {
       return new KeyAlreadyExistsExceptionStandardScheme();
     }
   }
 
-  private static class KeyAlreadyExistsExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<KeyAlreadyExistsException> {
+  private static class KeyAlreadyExistsExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<KeyAlreadyExistsException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, KeyAlreadyExistsException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, KeyAlreadyExistsException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, KeyAlreadyExistsException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, KeyAlreadyExistsException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class KeyAlreadyExistsException extends org.apache.thrift.TException impl
 
   }
 
-  private static class KeyAlreadyExistsExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class KeyAlreadyExistsExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public KeyAlreadyExistsExceptionTupleScheme getScheme() {
       return new KeyAlreadyExistsExceptionTupleScheme();
     }
   }
 
-  private static class KeyAlreadyExistsExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<KeyAlreadyExistsException> {
+  private static class KeyAlreadyExistsExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<KeyAlreadyExistsException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, KeyAlreadyExistsException 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, KeyAlreadyExistsException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, KeyAlreadyExistsException 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, KeyAlreadyExistsException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/KeyNotFoundException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java b/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java
index 8ec60d3..e8fafd7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/KeyNotFoundException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class KeyNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<KeyNotFoundException, KeyNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyNotFoundException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyNotFoundException");
+public class KeyNotFoundException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<KeyNotFoundException, KeyNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<KeyNotFoundException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("KeyNotFoundException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KeyNotFoundExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KeyNotFoundExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KeyNotFoundExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KeyNotFoundExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KeyNotFoundException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KeyNotFoundException.class, metaDataMap);
   }
 
   public KeyNotFoundException() {
@@ -240,7 +240,7 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
     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);
   }
 
@@ -276,10 +276,10 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
 
   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 KeyNotFoundExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class KeyNotFoundExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public KeyNotFoundExceptionStandardScheme getScheme() {
       return new KeyNotFoundExceptionStandardScheme();
     }
   }
 
-  private static class KeyNotFoundExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<KeyNotFoundException> {
+  private static class KeyNotFoundExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<KeyNotFoundException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, KeyNotFoundException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, KeyNotFoundException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, KeyNotFoundException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, KeyNotFoundException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class KeyNotFoundException extends org.apache.thrift.TException implement
 
   }
 
-  private static class KeyNotFoundExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class KeyNotFoundExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public KeyNotFoundExceptionTupleScheme getScheme() {
       return new KeyNotFoundExceptionTupleScheme();
     }
   }
 
-  private static class KeyNotFoundExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<KeyNotFoundException> {
+  private static class KeyNotFoundExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<KeyNotFoundException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, KeyNotFoundException 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, KeyNotFoundException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, KeyNotFoundException 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, KeyNotFoundException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/KillOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java b/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java
index 4f31bcc..3b8a3d1 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/KillOptions.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable, Comparable<KillOptions> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KillOptions");
+public class KillOptions implements org.apache.storm.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable, Comparable<KillOptions> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("KillOptions");
 
-  private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("wait_secs", org.apache.storm.thrift.protocol.TType.I32, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KillOptionsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KillOptionsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new KillOptionsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new KillOptionsTupleSchemeFactory();
 
   private int wait_secs; // 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 {
     WAIT_SECS((short)1, "wait_secs");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -97,13 +97,13 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
   private static final int __WAIT_SECS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.WAIT_SECS};
-  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.WAIT_SECS, new org.apache.thrift.meta_data.FieldMetaData("wait_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.WAIT_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("wait_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KillOptions.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KillOptions.class, metaDataMap);
   }
 
   public KillOptions() {
@@ -137,16 +137,16 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
   }
 
   public void unset_wait_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
   }
 
   /** Returns true if field wait_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_wait_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
   }
 
   public void set_wait_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -235,7 +235,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
       return lastComparison;
     }
     if (is_set_wait_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, other.wait_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.wait_secs, other.wait_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -247,11 +247,11 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
     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);
   }
 
@@ -269,15 +269,15 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -286,40 +286,40 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
     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 KillOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class KillOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public KillOptionsStandardScheme getScheme() {
       return new KillOptionsStandardScheme();
     }
   }
 
-  private static class KillOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<KillOptions> {
+  private static class KillOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<KillOptions> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, KillOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, KillOptions 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: // WAIT_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.wait_secs = iprot.readI32();
               struct.set_wait_secs_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();
       }
@@ -327,7 +327,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, KillOptions struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, KillOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -342,17 +342,17 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
 
   }
 
-  private static class KillOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class KillOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public KillOptionsTupleScheme getScheme() {
       return new KillOptionsTupleScheme();
     }
   }
 
-  private static class KillOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<KillOptions> {
+  private static class KillOptionsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<KillOptions> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, KillOptions 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, KillOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_wait_secs()) {
         optionals.set(0);
@@ -364,8 +364,8 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, KillOptions 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, KillOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.wait_secs = iprot.readI32();
@@ -374,8 +374,8 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
     }
   }
 
-  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/LSApprovedWorkers.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java
index 7fcd248..8e4cb0e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers");
+public class LSApprovedWorkers implements org.apache.storm.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSApprovedWorkers");
 
-  private static final org.apache.thrift.protocol.TField APPROVED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("approved_workers", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField APPROVED_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("approved_workers", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSApprovedWorkersStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSApprovedWorkersTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSApprovedWorkersStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSApprovedWorkersTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,java.lang.Integer> approved_workers; // 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 {
     APPROVED_WORKERS((short)1, "approved_workers");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,15 +94,15 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
   }
 
   // isset id assignments
-  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.APPROVED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("approved_workers", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+    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.APPROVED_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("approved_workers", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSApprovedWorkers.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSApprovedWorkers.class, metaDataMap);
   }
 
   public LSApprovedWorkers() {
@@ -254,7 +254,7 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
       return lastComparison;
     }
     if (is_set_approved_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.approved_workers, other.approved_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.approved_workers, other.approved_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -266,11 +266,11 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
     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);
   }
 
@@ -290,10 +290,10 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
     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_approved_workers()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'approved_workers' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'approved_workers' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -301,42 +301,42 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
 
   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 LSApprovedWorkersStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSApprovedWorkersStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSApprovedWorkersStandardScheme getScheme() {
       return new LSApprovedWorkersStandardScheme();
     }
   }
 
-  private static class LSApprovedWorkersStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSApprovedWorkers> {
+  private static class LSApprovedWorkersStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSApprovedWorkers> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSApprovedWorkers 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: // APPROVED_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map800 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map800 = iprot.readMapBegin();
                 struct.approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map800.size);
                 java.lang.String _key801;
                 int _val802;
@@ -350,11 +350,11 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
               }
               struct.set_approved_workers_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();
       }
@@ -362,14 +362,14 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSApprovedWorkers struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.approved_workers != null) {
         oprot.writeFieldBegin(APPROVED_WORKERS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.approved_workers.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, struct.approved_workers.size()));
           for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter804 : struct.approved_workers.entrySet())
           {
             oprot.writeString(_iter804.getKey());
@@ -385,17 +385,17 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
 
   }
 
-  private static class LSApprovedWorkersTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSApprovedWorkersTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSApprovedWorkersTupleScheme getScheme() {
       return new LSApprovedWorkersTupleScheme();
     }
   }
 
-  private static class LSApprovedWorkersTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSApprovedWorkers> {
+  private static class LSApprovedWorkersTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LSApprovedWorkers> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers 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, LSApprovedWorkers struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.approved_workers.size());
         for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter805 : struct.approved_workers.entrySet())
@@ -407,10 +407,10 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers 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, LSApprovedWorkers 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 _map806 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map806 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, iprot.readI32());
         struct.approved_workers = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map806.size);
         java.lang.String _key807;
         int _val808;
@@ -425,8 +425,8 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork
     }
   }
 
-  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/LSSupervisorAssignments.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java
index 4abe47a..b6909e7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments");
+public class LSSupervisorAssignments implements org.apache.storm.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSSupervisorAssignments");
 
-  private static final org.apache.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("assignments", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assignments", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSSupervisorAssignmentsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSSupervisorAssignmentsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSSupervisorAssignmentsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSSupervisorAssignmentsTupleSchemeFactory();
 
   private java.util.Map<java.lang.Integer,LocalAssignment> assignments; // 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 {
     ASSIGNMENTS((short)1, "assignments");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,15 +94,15 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
   }
 
   // isset id assignments
-  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.ASSIGNMENTS, new org.apache.thrift.meta_data.FieldMetaData("assignments", 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.I32), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LocalAssignment.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.ASSIGNMENTS, new org.apache.storm.thrift.meta_data.FieldMetaData("assignments", 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.I32), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, LocalAssignment.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorAssignments.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorAssignments.class, metaDataMap);
   }
 
   public LSSupervisorAssignments() {
@@ -265,7 +265,7 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
       return lastComparison;
     }
     if (is_set_assignments()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assignments, other.assignments);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assignments, other.assignments);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -277,11 +277,11 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
     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);
   }
 
@@ -301,10 +301,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
     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_assignments()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'assignments' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'assignments' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -312,42 +312,42 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
 
   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 LSSupervisorAssignmentsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSSupervisorAssignmentsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSSupervisorAssignmentsStandardScheme getScheme() {
       return new LSSupervisorAssignmentsStandardScheme();
     }
   }
 
-  private static class LSSupervisorAssignmentsStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSSupervisorAssignments> {
+  private static class LSSupervisorAssignmentsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSSupervisorAssignments> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSSupervisorAssignments 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: // ASSIGNMENTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map810 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map810 = iprot.readMapBegin();
                 struct.assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(2*_map810.size);
                 int _key811;
                 LocalAssignment _val812;
@@ -362,11 +362,11 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
               }
               struct.set_assignments_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();
       }
@@ -374,14 +374,14 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSSupervisorAssignments struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.assignments != null) {
         oprot.writeFieldBegin(ASSIGNMENTS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.assignments.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.I32, org.apache.storm.thrift.protocol.TType.STRUCT, struct.assignments.size()));
           for (java.util.Map.Entry<java.lang.Integer, LocalAssignment> _iter814 : struct.assignments.entrySet())
           {
             oprot.writeI32(_iter814.getKey());
@@ -397,17 +397,17 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
 
   }
 
-  private static class LSSupervisorAssignmentsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSSupervisorAssignmentsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSSupervisorAssignmentsTupleScheme getScheme() {
       return new LSSupervisorAssignmentsTupleScheme();
     }
   }
 
-  private static class LSSupervisorAssignmentsTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSSupervisorAssignments> {
+  private static class LSSupervisorAssignmentsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LSSupervisorAssignments> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments 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, LSSupervisorAssignments struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.assignments.size());
         for (java.util.Map.Entry<java.lang.Integer, LocalAssignment> _iter815 : struct.assignments.entrySet())
@@ -419,10 +419,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments 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, LSSupervisorAssignments 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 _map816 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map816 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.I32, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.assignments = new java.util.HashMap<java.lang.Integer,LocalAssignment>(2*_map816.size);
         int _key817;
         LocalAssignment _val818;
@@ -438,8 +438,8 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv
     }
   }
 
-  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/LSSupervisorId.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java
index 15b9651..96d5820 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorId.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, LSSupervisorId._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorId> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorId");
+public class LSSupervisorId implements org.apache.storm.thrift.TBase<LSSupervisorId, LSSupervisorId._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorId> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSSupervisorId");
 
-  private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("supervisor_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSSupervisorIdStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSSupervisorIdTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSSupervisorIdStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSSupervisorIdTupleSchemeFactory();
 
   private java.lang.String supervisor_id; // 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 {
     SUPERVISOR_ID((short)1, "supervisor_id");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
   }
 
   // isset id assignments
-  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.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.SUPERVISOR_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorId.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorId.class, metaDataMap);
   }
 
   public LSSupervisorId() {
@@ -240,7 +240,7 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
       return lastComparison;
     }
     if (is_set_supervisor_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
     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);
   }
 
@@ -276,10 +276,10 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
     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_supervisor_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
 
   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 LSSupervisorIdStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSSupervisorIdStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSSupervisorIdStandardScheme getScheme() {
       return new LSSupervisorIdStandardScheme();
     }
   }
 
-  private static class LSSupervisorIdStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSSupervisorId> {
+  private static class LSSupervisorIdStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSSupervisorId> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorId struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSSupervisorId 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: // SUPERVISOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.supervisor_id = iprot.readString();
               struct.set_supervisor_id_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();
       }
@@ -336,7 +336,7 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LSSupervisorId struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSSupervisorId struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, L
 
   }
 
-  private static class LSSupervisorIdTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSSupervisorIdTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSSupervisorIdTupleScheme getScheme() {
       return new LSSupervisorIdTupleScheme();
     }
   }
 
-  private static class LSSupervisorIdTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSSupervisorId> {
+  private static class LSSupervisorIdTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LSSupervisorId> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorId 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, LSSupervisorId struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.supervisor_id);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorId 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, LSSupervisorId struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.supervisor_id = iprot.readString();
       struct.set_supervisor_id_isSet(true);
     }
   }
 
-  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();
   }
 }
 


[49/50] [abbrv] storm git commit: STORM-2882: Clean up shadeing to make life better

Posted by bo...@apache.org.
STORM-2882: Clean up shadeing to make life better


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/35a1b8f4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/35a1b8f4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/35a1b8f4

Branch: refs/heads/master
Commit: 35a1b8f4822eed54f95f0d1ea7e71dfe1b97a796
Parents: b588b25
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jun 6 17:01:52 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 17:01:52 2018 -0500

----------------------------------------------------------------------
 DEVELOPER.md                       |  7 -------
 dev-tools/travis/travis-install.sh |  2 +-
 dev-tools/travis/travis-script.sh  |  2 +-
 pom.xml                            | 12 ++++++++++--
 shaded-deps/pom.xml                | 20 ++++++++++++++++++++
 5 files changed, 32 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/35a1b8f4/DEVELOPER.md
----------------------------------------------------------------------
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 1ae0ea6..e2f0a4b 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -239,13 +239,6 @@ To pull in a merge request you should generally follow the command line instruct
 # Build the code and run the tests
 
 ## Prerequisites
-To work around a conflict between the shade plugin and maven https://issues.apache.org/jira/browse/MSHADE-206, a set of 
-dependencies needs to be shaded and installed by running:
-
-```sh
-cd shaded-deps
-mvn clean install
-```
 
 In order to build `storm` you need `python`, `ruby` and `nodejs`. In order to avoid an overfull page we don't provide platform/OS specific installation instructions for those here. Please refer to you platform's/OS' documentation for support.
 

http://git-wip-us.apache.org/repos/asf/storm/blob/35a1b8f4/dev-tools/travis/travis-install.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-install.sh b/dev-tools/travis/travis-install.sh
index 56ea68d..a2668f8 100755
--- a/dev-tools/travis/travis-install.sh
+++ b/dev-tools/travis/travis-install.sh
@@ -28,7 +28,7 @@ then
 fi
 
 cd ${STORM_SRC_ROOT_DIR}
-python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install.txt" mvn clean install -DskipTests -Pnative --batch-mode
+python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install.txt" mvn clean install -DskipTests -Pnative '-P!include-shaded-deps' --batch-mode
 BUILD_RET_VAL=$?
 
 if [[ "$BUILD_RET_VAL" != "0" ]];

http://git-wip-us.apache.org/repos/asf/storm/blob/35a1b8f4/dev-tools/travis/travis-script.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh
index fb13042..6fc2778 100755
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@ -31,7 +31,7 @@ else
   # Travis only has 3GB of memory, lets use 1GB for build, and 1.5GB for forked JVMs
   export MAVEN_OPTS="-Xmx1024m"
   
-  mvn --batch-mode test -fae -Pnative,all-tests -Prat -pl "$2"
+  mvn --batch-mode test -fae -Pnative,all-tests '-P!include-shaded-deps' -Prat -pl "$2"
   BUILD_RET_VAL=$?
   
   for dir in `find . -type d -and -wholename \*/target/\*-reports`;

http://git-wip-us.apache.org/repos/asf/storm/blob/35a1b8f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44d5910..8a6df9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
             <id>Ethanlm</id>
             <name>Ethan Li</name>
             <email>ethanli@apache.org</email>
-            <roles>	
+            <roles>
                 <role>Committer</role>
             </roles>
             <timezone>-6</timezone>
@@ -430,7 +430,15 @@
                 <provided.scope>compile</provided.scope>
             </properties>
         </profile>
-
+        <profile>
+            <id>include-shaded-deps</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>shaded-deps</module>
+            </modules>
+        </profile>
         <profile>
             <id>rat</id>
             <build>

http://git-wip-us.apache.org/repos/asf/storm/blob/35a1b8f4/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index aa92f8f..8b33c70 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -36,17 +36,24 @@
     <description>Shaded version of dependencies used only for internal storm code.</description>
 
     <dependencies>
+        <!-- All dependencies should be marked as optional to work around
+             https://issues.apache.org/jira/browse/MSHADE-206 which makes it so
+             the dependency reduced pom is not reflected in a multi-module build
+             correctly. -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
+            <optional>true</optional>
         </dependency>
         <!-- curator-recipes is not used by storm-client, but because storm-server
              uses the same zookeeper initialization code as storm-client all
@@ -54,10 +61,12 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>true</optional>
             <exclusions>
                 <exclusion>
                     <!-- This is only used for interactive zookeeper shell, and not needed for the client-->
@@ -74,38 +83,47 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jctools</groupId>
             <artifactId>jctools-core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
+            <optional>true</optional>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -132,10 +150,12 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>uk.org.lidalia</groupId>
             <artifactId>sysout-over-slf4j</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java
index 2ef23eb..d5dbd2e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCExecutionException.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 DRPCExecutionException extends org.apache.thrift.TException implements org.apache.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCExecutionException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCExecutionException");
+public class DRPCExecutionException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCExecutionException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("DRPCExecutionException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("type", org.apache.storm.thrift.protocol.TType.I32, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DRPCExecutionExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DRPCExecutionExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DRPCExecutionExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DRPCExecutionExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // required
   private DRPCExceptionType type; // 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 {
     MSG((short)1, "msg"),
     /**
      * 
@@ -104,15 +104,15 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.TYPE};
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DRPCExceptionType.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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("type", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, DRPCExceptionType.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DRPCExecutionException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DRPCExecutionException.class, metaDataMap);
   }
 
   public DRPCExecutionException() {
@@ -313,7 +313,7 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -323,7 +323,7 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
       return lastComparison;
     }
     if (is_set_type()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -335,11 +335,11 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
     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 DRPCExecutionException extends org.apache.thrift.TException impleme
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -380,56 +380,56 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
 
   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 DRPCExecutionExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class DRPCExecutionExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public DRPCExecutionExceptionStandardScheme getScheme() {
       return new DRPCExecutionExceptionStandardScheme();
     }
   }
 
-  private static class DRPCExecutionExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<DRPCExecutionException> {
+  private static class DRPCExecutionExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<DRPCExecutionException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCExecutionException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, DRPCExecutionException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.type = org.apache.storm.generated.DRPCExceptionType.findByValue(iprot.readI32());
               struct.set_type_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();
       }
@@ -437,7 +437,7 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, DRPCExecutionException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -459,17 +459,17 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
 
   }
 
-  private static class DRPCExecutionExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class DRPCExecutionExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public DRPCExecutionExceptionTupleScheme getScheme() {
       return new DRPCExecutionExceptionTupleScheme();
     }
   }
 
-  private static class DRPCExecutionExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<DRPCExecutionException> {
+  private static class DRPCExecutionExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<DRPCExecutionException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException 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, DRPCExecutionException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_type()) {
@@ -482,8 +482,8 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException 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, DRPCExecutionException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(1);
@@ -494,8 +494,8 @@ public class DRPCExecutionException extends org.apache.thrift.TException impleme
     }
   }
 
-  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/DRPCRequest.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java
index 9e90a33..4cb1ec4 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCRequest.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 DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCRequest> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCRequest");
+public class DRPCRequest implements org.apache.storm.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCRequest> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("DRPCRequest");
 
-  private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("func_args", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField REQUEST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("request_id", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("func_args", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField REQUEST_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("request_id", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DRPCRequestStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DRPCRequestTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DRPCRequestStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DRPCRequestTupleSchemeFactory();
 
   private java.lang.String func_args; // required
   private java.lang.String request_id; // 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 {
     FUNC_ARGS((short)1, "func_args"),
     REQUEST_ID((short)2, "request_id");
 
@@ -99,15 +99,15 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
   }
 
   // isset id assignments
-  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.FUNC_ARGS, new org.apache.thrift.meta_data.FieldMetaData("func_args", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("request_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.FUNC_ARGS, new org.apache.storm.thrift.meta_data.FieldMetaData("func_args", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.REQUEST_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("request_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DRPCRequest.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DRPCRequest.class, metaDataMap);
   }
 
   public DRPCRequest() {
@@ -302,7 +302,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
       return lastComparison;
     }
     if (is_set_func_args()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.func_args, other.func_args);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.func_args, other.func_args);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
       return lastComparison;
     }
     if (is_set_request_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request_id, other.request_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.request_id, other.request_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
     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);
   }
 
@@ -356,14 +356,14 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
     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_func_args()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'func_args' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'func_args' is unset! Struct:" + toString());
     }
 
     if (!is_set_request_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'request_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'request_id' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -371,56 +371,56 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
 
   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 DRPCRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class DRPCRequestStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public DRPCRequestStandardScheme getScheme() {
       return new DRPCRequestStandardScheme();
     }
   }
 
-  private static class DRPCRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<DRPCRequest> {
+  private static class DRPCRequestStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<DRPCRequest> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, DRPCRequest 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: // FUNC_ARGS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.func_args = iprot.readString();
               struct.set_func_args_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: // REQUEST_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.request_id = iprot.readString();
               struct.set_request_id_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();
       }
@@ -428,7 +428,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCRequest struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, DRPCRequest struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -448,24 +448,24 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
 
   }
 
-  private static class DRPCRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class DRPCRequestTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public DRPCRequestTupleScheme getScheme() {
       return new DRPCRequestTupleScheme();
     }
   }
 
-  private static class DRPCRequestTupleScheme extends org.apache.thrift.scheme.TupleScheme<DRPCRequest> {
+  private static class DRPCRequestTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<DRPCRequest> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, DRPCRequest 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, DRPCRequest struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.func_args);
       oprot.writeString(struct.request_id);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, DRPCRequest 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, DRPCRequest struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.func_args = iprot.readString();
       struct.set_func_args_isSet(true);
       struct.request_id = iprot.readString();
@@ -473,8 +473,8 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
     }
   }
 
-  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/DebugOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java b/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java
index 8532ee8..d78689c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DebugOptions.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 DebugOptions implements org.apache.thrift.TBase<DebugOptions, DebugOptions._Fields>, java.io.Serializable, Cloneable, Comparable<DebugOptions> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DebugOptions");
+public class DebugOptions implements org.apache.storm.thrift.TBase<DebugOptions, DebugOptions._Fields>, java.io.Serializable, Cloneable, Comparable<DebugOptions> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("DebugOptions");
 
-  private static final org.apache.thrift.protocol.TField ENABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("enable", org.apache.thrift.protocol.TType.BOOL, (short)1);
-  private static final org.apache.thrift.protocol.TField SAMPLINGPCT_FIELD_DESC = new org.apache.thrift.protocol.TField("samplingpct", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField ENABLE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("enable", org.apache.storm.thrift.protocol.TType.BOOL, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SAMPLINGPCT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("samplingpct", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DebugOptionsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DebugOptionsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DebugOptionsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DebugOptionsTupleSchemeFactory();
 
   private boolean enable; // optional
   private double samplingpct; // 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 {
     ENABLE((short)1, "enable"),
     SAMPLINGPCT((short)2, "samplingpct");
 
@@ -103,15 +103,15 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
   private static final int __SAMPLINGPCT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.ENABLE,_Fields.SAMPLINGPCT};
-  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.ENABLE, new org.apache.thrift.meta_data.FieldMetaData("enable", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.SAMPLINGPCT, new org.apache.thrift.meta_data.FieldMetaData("samplingpct", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.ENABLE, new org.apache.storm.thrift.meta_data.FieldMetaData("enable", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.SAMPLINGPCT, new org.apache.storm.thrift.meta_data.FieldMetaData("samplingpct", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DebugOptions.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DebugOptions.class, metaDataMap);
   }
 
   public DebugOptions() {
@@ -148,16 +148,16 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
   }
 
   public void unset_enable() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENABLE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENABLE_ISSET_ID);
   }
 
   /** Returns true if field enable is set (has been assigned a value) and false otherwise */
   public boolean is_set_enable() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENABLE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ENABLE_ISSET_ID);
   }
 
   public void set_enable_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENABLE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ENABLE_ISSET_ID, value);
   }
 
   public double get_samplingpct() {
@@ -170,16 +170,16 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
   }
 
   public void unset_samplingpct() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID);
   }
 
   /** Returns true if field samplingpct is set (has been assigned a value) and false otherwise */
   public boolean is_set_samplingpct() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID);
   }
 
   public void set_samplingpct_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -276,7 +276,7 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
 
     hashCode = hashCode * 8191 + ((is_set_samplingpct()) ? 131071 : 524287);
     if (is_set_samplingpct())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(samplingpct);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(samplingpct);
 
     return hashCode;
   }
@@ -294,7 +294,7 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
       return lastComparison;
     }
     if (is_set_enable()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.enable, other.enable);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.enable, other.enable);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -304,7 +304,7 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
       return lastComparison;
     }
     if (is_set_samplingpct()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.samplingpct, other.samplingpct);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.samplingpct, other.samplingpct);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -316,11 +316,11 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
     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);
   }
 
@@ -344,15 +344,15 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -361,48 +361,48 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
     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 DebugOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class DebugOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public DebugOptionsStandardScheme getScheme() {
       return new DebugOptionsStandardScheme();
     }
   }
 
-  private static class DebugOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<DebugOptions> {
+  private static class DebugOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<DebugOptions> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, DebugOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, DebugOptions 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: // ENABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.BOOL) {
               struct.enable = iprot.readBool();
               struct.set_enable_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: // SAMPLINGPCT
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.samplingpct = iprot.readDouble();
               struct.set_samplingpct_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();
       }
@@ -410,7 +410,7 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, DebugOptions struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, DebugOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -430,17 +430,17 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
 
   }
 
-  private static class DebugOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class DebugOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public DebugOptionsTupleScheme getScheme() {
       return new DebugOptionsTupleScheme();
     }
   }
 
-  private static class DebugOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<DebugOptions> {
+  private static class DebugOptionsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<DebugOptions> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, DebugOptions 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, DebugOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_enable()) {
         optionals.set(0);
@@ -458,8 +458,8 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, DebugOptions 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, DebugOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.enable = iprot.readBool();
@@ -472,8 +472,8 @@ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, Debug
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Grouping.java b/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
index 5befe37..3bf9eaf 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Grouping.java
@@ -24,19 +24,19 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Grouping");
-  private static final org.apache.thrift.protocol.TField FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("fields", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField SHUFFLE_FIELD_DESC = new org.apache.thrift.protocol.TField("shuffle", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField ALL_FIELD_DESC = new org.apache.thrift.protocol.TField("all", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField NONE_FIELD_DESC = new org.apache.thrift.protocol.TField("none", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-  private static final org.apache.thrift.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("direct", org.apache.thrift.protocol.TType.STRUCT, (short)5);
-  private static final org.apache.thrift.protocol.TField CUSTOM_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("custom_object", org.apache.thrift.protocol.TType.STRUCT, (short)6);
-  private static final org.apache.thrift.protocol.TField CUSTOM_SERIALIZED_FIELD_DESC = new org.apache.thrift.protocol.TField("custom_serialized", org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField LOCAL_OR_SHUFFLE_FIELD_DESC = new org.apache.thrift.protocol.TField("local_or_shuffle", org.apache.thrift.protocol.TType.STRUCT, (short)8);
+public class Grouping extends org.apache.storm.thrift.TUnion<Grouping, Grouping._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Grouping");
+  private static final org.apache.storm.thrift.protocol.TField FIELDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("fields", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SHUFFLE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("shuffle", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField ALL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("all", org.apache.storm.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField NONE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("none", org.apache.storm.thrift.protocol.TType.STRUCT, (short)4);
+  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.STRUCT, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField CUSTOM_OBJECT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("custom_object", org.apache.storm.thrift.protocol.TType.STRUCT, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField CUSTOM_SERIALIZED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("custom_serialized", org.apache.storm.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField LOCAL_OR_SHUFFLE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("local_or_shuffle", org.apache.storm.thrift.protocol.TType.STRUCT, (short)8);
 
   /** 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 {
     FIELDS((short)1, "fields"),
     SHUFFLE((short)2, "shuffle"),
     ALL((short)3, "all"),
@@ -114,28 +114,28 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
     }
   }
 
-  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.FIELDS, new org.apache.thrift.meta_data.FieldMetaData("fields", 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.SHUFFLE, new org.apache.thrift.meta_data.FieldMetaData("shuffle", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class)));
-    tmpMap.put(_Fields.ALL, new org.apache.thrift.meta_data.FieldMetaData("all", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class)));
-    tmpMap.put(_Fields.NONE, new org.apache.thrift.meta_data.FieldMetaData("none", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class)));
-    tmpMap.put(_Fields.DIRECT, new org.apache.thrift.meta_data.FieldMetaData("direct", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.class)));
-    tmpMap.put(_Fields.CUSTOM_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("custom_object", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JavaObject.class)));
-    tmpMap.put(_Fields.CUSTOM_SERIALIZED, new org.apache.thrift.meta_data.FieldMetaData("custom_serialized", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.LOCAL_OR_SHUFFLE, new org.apache.thrift.meta_data.FieldMetaData("local_or_shuffle", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NullStruct.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.FIELDS, new org.apache.storm.thrift.meta_data.FieldMetaData("fields", 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.SHUFFLE, new org.apache.storm.thrift.meta_data.FieldMetaData("shuffle", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NullStruct.class)));
+    tmpMap.put(_Fields.ALL, new org.apache.storm.thrift.meta_data.FieldMetaData("all", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NullStruct.class)));
+    tmpMap.put(_Fields.NONE, new org.apache.storm.thrift.meta_data.FieldMetaData("none", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NullStruct.class)));
+    tmpMap.put(_Fields.DIRECT, new org.apache.storm.thrift.meta_data.FieldMetaData("direct", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NullStruct.class)));
+    tmpMap.put(_Fields.CUSTOM_OBJECT, new org.apache.storm.thrift.meta_data.FieldMetaData("custom_object", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, JavaObject.class)));
+    tmpMap.put(_Fields.CUSTOM_SERIALIZED, new org.apache.storm.thrift.meta_data.FieldMetaData("custom_serialized", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.LOCAL_OR_SHUFFLE, new org.apache.storm.thrift.meta_data.FieldMetaData("local_or_shuffle", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NullStruct.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Grouping.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Grouping.class, metaDataMap);
   }
 
   public Grouping() {
@@ -257,7 +257,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -265,7 +265,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
           if (field.type == FIELDS_FIELD_DESC.type) {
             java.util.List<java.lang.String> fields;
             {
-              org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
+              org.apache.storm.thrift.protocol.TList _list8 = iprot.readListBegin();
               fields = new java.util.ArrayList<java.lang.String>(_list8.size);
               java.lang.String _elem9;
               for (int _i10 = 0; _i10 < _list8.size; ++_i10)
@@ -277,7 +277,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             }
             return fields;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case SHUFFLE:
@@ -287,7 +287,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             shuffle.read(iprot);
             return shuffle;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case ALL:
@@ -297,7 +297,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             all.read(iprot);
             return all;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case NONE:
@@ -307,7 +307,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             none.read(iprot);
             return none;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case DIRECT:
@@ -317,7 +317,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             direct.read(iprot);
             return direct;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case CUSTOM_OBJECT:
@@ -327,7 +327,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             custom_object.read(iprot);
             return custom_object;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case CUSTOM_SERIALIZED:
@@ -336,7 +336,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             custom_serialized = iprot.readBinary();
             return custom_serialized;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case LOCAL_OR_SHUFFLE:
@@ -346,25 +346,25 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
             local_or_shuffle.read(iprot);
             return local_or_shuffle;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case FIELDS:
         java.util.List<java.lang.String> fields = (java.util.List<java.lang.String>)value_;
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, fields.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, fields.size()));
           for (java.lang.String _iter11 : fields)
           {
             oprot.writeString(_iter11);
@@ -406,14 +406,14 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
         case FIELDS:
           java.util.List<java.lang.String> fields;
           {
-            org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
+            org.apache.storm.thrift.protocol.TList _list12 = iprot.readListBegin();
             fields = new java.util.ArrayList<java.lang.String>(_list12.size);
             java.lang.String _elem13;
             for (int _i14 = 0; _i14 < _list12.size; ++_i14)
@@ -462,17 +462,17 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case FIELDS:
         java.util.List<java.lang.String> fields = (java.util.List<java.lang.String>)value_;
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, fields.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, fields.size()));
           for (java.lang.String _iter15 : fields)
           {
             oprot.writeString(_iter15);
@@ -514,7 +514,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case FIELDS:
         return FIELDS_FIELD_DESC;
@@ -538,7 +538,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -637,14 +637,14 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   }
 
   public byte[] get_custom_serialized() {
-    set_custom_serialized(org.apache.thrift.TBaseHelper.rightSize(buffer_for_custom_serialized()));
+    set_custom_serialized(org.apache.storm.thrift.TBaseHelper.rightSize(buffer_for_custom_serialized()));
     java.nio.ByteBuffer b = buffer_for_custom_serialized();
     return b == null ? null : b.array();
   }
 
   public java.nio.ByteBuffer buffer_for_custom_serialized() {
     if (getSetField() == _Fields.CUSTOM_SERIALIZED) {
-      return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
     } else {
       throw new java.lang.RuntimeException("Cannot get field 'custom_serialized' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
@@ -728,9 +728,9 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
 
   @Override
   public int compareTo(Grouping other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -740,12 +740,12 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -754,8 +754,8 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
   }
   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);
     }
   }
@@ -763,8 +763,8 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
 
   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);
     }
   }

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java b/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
index 12305ec..d864fc1 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBAuthorizationException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class HBAuthorizationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<HBAuthorizationException, HBAuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<HBAuthorizationException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBAuthorizationException");
+public class HBAuthorizationException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<HBAuthorizationException, HBAuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<HBAuthorizationException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBAuthorizationException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBAuthorizationExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBAuthorizationExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBAuthorizationExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBAuthorizationExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBAuthorizationException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBAuthorizationException.class, metaDataMap);
   }
 
   public HBAuthorizationException() {
@@ -240,7 +240,7 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
     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);
   }
 
@@ -276,10 +276,10 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
 
   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 HBAuthorizationExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBAuthorizationExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBAuthorizationExceptionStandardScheme getScheme() {
       return new HBAuthorizationExceptionStandardScheme();
     }
   }
 
-  private static class HBAuthorizationExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<HBAuthorizationException> {
+  private static class HBAuthorizationExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBAuthorizationException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HBAuthorizationException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBAuthorizationException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HBAuthorizationException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBAuthorizationException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class HBAuthorizationException extends org.apache.thrift.TException imple
 
   }
 
-  private static class HBAuthorizationExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBAuthorizationExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBAuthorizationExceptionTupleScheme getScheme() {
       return new HBAuthorizationExceptionTupleScheme();
     }
   }
 
-  private static class HBAuthorizationExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<HBAuthorizationException> {
+  private static class HBAuthorizationExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<HBAuthorizationException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HBAuthorizationException 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, HBAuthorizationException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HBAuthorizationException 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, HBAuthorizationException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/HBExecutionException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java b/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java
index a073b7e..903af28 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBExecutionException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class HBExecutionException extends org.apache.thrift.TException implements org.apache.thrift.TBase<HBExecutionException, HBExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<HBExecutionException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBExecutionException");
+public class HBExecutionException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<HBExecutionException, HBExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<HBExecutionException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBExecutionException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBExecutionExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBExecutionExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBExecutionExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBExecutionExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class HBExecutionException extends org.apache.thrift.TException implement
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBExecutionException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBExecutionException.class, metaDataMap);
   }
 
   public HBExecutionException() {
@@ -240,7 +240,7 @@ public class HBExecutionException extends org.apache.thrift.TException implement
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class HBExecutionException extends org.apache.thrift.TException implement
     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);
   }
 
@@ -276,10 +276,10 @@ public class HBExecutionException extends org.apache.thrift.TException implement
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class HBExecutionException extends org.apache.thrift.TException implement
 
   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 HBExecutionExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBExecutionExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBExecutionExceptionStandardScheme getScheme() {
       return new HBExecutionExceptionStandardScheme();
     }
   }
 
-  private static class HBExecutionExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<HBExecutionException> {
+  private static class HBExecutionExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBExecutionException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HBExecutionException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBExecutionException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class HBExecutionException extends org.apache.thrift.TException implement
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HBExecutionException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBExecutionException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class HBExecutionException extends org.apache.thrift.TException implement
 
   }
 
-  private static class HBExecutionExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBExecutionExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBExecutionExceptionTupleScheme getScheme() {
       return new HBExecutionExceptionTupleScheme();
     }
   }
 
-  private static class HBExecutionExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<HBExecutionException> {
+  private static class HBExecutionExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<HBExecutionException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HBExecutionException 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, HBExecutionException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HBExecutionException 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, HBExecutionException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/HBMessage.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java b/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java
index a6453f6..f47f902 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBMessage.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBMessage.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 HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._Fields>, java.io.Serializable, Cloneable, Comparable<HBMessage> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBMessage");
+public class HBMessage implements org.apache.storm.thrift.TBase<HBMessage, HBMessage._Fields>, java.io.Serializable, Cloneable, Comparable<HBMessage> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBMessage");
 
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField MESSAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("message_id", org.apache.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("type", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("data", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField MESSAGE_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("message_id", org.apache.storm.thrift.protocol.TType.I32, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBMessageStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBMessageTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBMessageStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBMessageTupleSchemeFactory();
 
   private HBServerMessageType type; // required
   private HBMessageData data; // required
   private int message_id; // 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 HBServerMessageType
@@ -111,17 +111,17 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
   private static final int __MESSAGE_ID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.MESSAGE_ID};
-  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.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, HBServerMessageType.class)));
-    tmpMap.put(_Fields.DATA, new org.apache.thrift.meta_data.FieldMetaData("data", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HBMessageData.class)));
-    tmpMap.put(_Fields.MESSAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("message_id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("type", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, HBServerMessageType.class)));
+    tmpMap.put(_Fields.DATA, new org.apache.storm.thrift.meta_data.FieldMetaData("data", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, HBMessageData.class)));
+    tmpMap.put(_Fields.MESSAGE_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("message_id", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBMessage.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBMessage.class, metaDataMap);
   }
 
   public HBMessage() {
@@ -228,16 +228,16 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
   }
 
   public void unset_message_id() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID);
   }
 
   /** Returns true if field message_id is set (has been assigned a value) and false otherwise */
   public boolean is_set_message_id() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID);
   }
 
   public void set_message_id_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MESSAGE_ID_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -378,7 +378,7 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
       return lastComparison;
     }
     if (is_set_type()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -388,7 +388,7 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
       return lastComparison;
     }
     if (is_set_data()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.data, other.data);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -398,7 +398,7 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
       return lastComparison;
     }
     if (is_set_message_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message_id, other.message_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.message_id, other.message_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -410,11 +410,11 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
     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);
   }
 
@@ -448,15 +448,15 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -465,57 +465,57 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
     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 HBMessageStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBMessageStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBMessageStandardScheme getScheme() {
       return new HBMessageStandardScheme();
     }
   }
 
-  private static class HBMessageStandardScheme extends org.apache.thrift.scheme.StandardScheme<HBMessage> {
+  private static class HBMessageStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBMessage> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HBMessage struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBMessage 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: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.type = org.apache.storm.generated.HBServerMessageType.findByValue(iprot.readI32());
               struct.set_type_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: // DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.data = new HBMessageData();
               struct.data.read(iprot);
               struct.set_data_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: // MESSAGE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.message_id = iprot.readI32();
               struct.set_message_id_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();
       }
@@ -523,7 +523,7 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HBMessage struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBMessage struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -548,17 +548,17 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
 
   }
 
-  private static class HBMessageTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBMessageTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBMessageTupleScheme getScheme() {
       return new HBMessageTupleScheme();
     }
   }
 
-  private static class HBMessageTupleScheme extends org.apache.thrift.scheme.TupleScheme<HBMessage> {
+  private static class HBMessageTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<HBMessage> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HBMessage 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, HBMessage struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_type()) {
         optionals.set(0);
@@ -582,8 +582,8 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HBMessage 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, HBMessage struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.type = org.apache.storm.generated.HBServerMessageType.findByValue(iprot.readI32());
@@ -601,8 +601,8 @@ public class HBMessage implements org.apache.thrift.TBase<HBMessage, HBMessage._
     }
   }
 
-  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/HBMessageData.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java b/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java
index e23a145..fc5f58d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBMessageData.java
@@ -24,17 +24,17 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMessageData._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBMessageData");
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField PULSE_FIELD_DESC = new org.apache.thrift.protocol.TField("pulse", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField BOOLVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("boolval", org.apache.thrift.protocol.TType.BOOL, (short)3);
-  private static final org.apache.thrift.protocol.TField RECORDS_FIELD_DESC = new org.apache.thrift.protocol.TField("records", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-  private static final org.apache.thrift.protocol.TField NODES_FIELD_DESC = new org.apache.thrift.protocol.TField("nodes", org.apache.thrift.protocol.TType.STRUCT, (short)5);
-  private static final org.apache.thrift.protocol.TField MESSAGE_BLOB_FIELD_DESC = new org.apache.thrift.protocol.TField("message_blob", org.apache.thrift.protocol.TType.STRING, (short)7);
+public class HBMessageData extends org.apache.storm.thrift.TUnion<HBMessageData, HBMessageData._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBMessageData");
+  private static final org.apache.storm.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("path", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PULSE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("pulse", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField BOOLVAL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("boolval", org.apache.storm.thrift.protocol.TType.BOOL, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField RECORDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("records", org.apache.storm.thrift.protocol.TType.STRUCT, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField NODES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("nodes", org.apache.storm.thrift.protocol.TType.STRUCT, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField MESSAGE_BLOB_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("message_blob", org.apache.storm.thrift.protocol.TType.STRING, (short)7);
 
   /** 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 {
     PATH((short)1, "path"),
     PULSE((short)2, "pulse"),
     BOOLVAL((short)3, "boolval"),
@@ -106,23 +106,23 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
     }
   }
 
-  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.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PULSE, new org.apache.thrift.meta_data.FieldMetaData("pulse", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HBPulse.class)));
-    tmpMap.put(_Fields.BOOLVAL, new org.apache.thrift.meta_data.FieldMetaData("boolval", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.RECORDS, new org.apache.thrift.meta_data.FieldMetaData("records", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HBRecords.class)));
-    tmpMap.put(_Fields.NODES, new org.apache.thrift.meta_data.FieldMetaData("nodes", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HBNodes.class)));
-    tmpMap.put(_Fields.MESSAGE_BLOB, new org.apache.thrift.meta_data.FieldMetaData("message_blob", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    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.PATH, new org.apache.storm.thrift.meta_data.FieldMetaData("path", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PULSE, new org.apache.storm.thrift.meta_data.FieldMetaData("pulse", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, HBPulse.class)));
+    tmpMap.put(_Fields.BOOLVAL, new org.apache.storm.thrift.meta_data.FieldMetaData("boolval", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.RECORDS, new org.apache.storm.thrift.meta_data.FieldMetaData("records", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, HBRecords.class)));
+    tmpMap.put(_Fields.NODES, new org.apache.storm.thrift.meta_data.FieldMetaData("nodes", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, HBNodes.class)));
+    tmpMap.put(_Fields.MESSAGE_BLOB, new org.apache.storm.thrift.meta_data.FieldMetaData("message_blob", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBMessageData.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBMessageData.class, metaDataMap);
   }
 
   public HBMessageData() {
@@ -222,7 +222,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -232,7 +232,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
             path = iprot.readString();
             return path;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case PULSE:
@@ -242,7 +242,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
             pulse.read(iprot);
             return pulse;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case BOOLVAL:
@@ -251,7 +251,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
             boolval = iprot.readBool();
             return boolval;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case RECORDS:
@@ -261,7 +261,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
             records.read(iprot);
             return records;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case NODES:
@@ -271,7 +271,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
             nodes.read(iprot);
             return nodes;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case MESSAGE_BLOB:
@@ -280,20 +280,20 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
             message_blob = iprot.readBinary();
             return message_blob;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case PATH:
         java.lang.String path = (java.lang.String)value_;
@@ -325,7 +325,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
@@ -360,12 +360,12 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case PATH:
         java.lang.String path = (java.lang.String)value_;
@@ -397,7 +397,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case PATH:
         return PATH_FIELD_DESC;
@@ -417,7 +417,7 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -501,14 +501,14 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   }
 
   public byte[] get_message_blob() {
-    set_message_blob(org.apache.thrift.TBaseHelper.rightSize(buffer_for_message_blob()));
+    set_message_blob(org.apache.storm.thrift.TBaseHelper.rightSize(buffer_for_message_blob()));
     java.nio.ByteBuffer b = buffer_for_message_blob();
     return b == null ? null : b.array();
   }
 
   public java.nio.ByteBuffer buffer_for_message_blob() {
     if (getSetField() == _Fields.MESSAGE_BLOB) {
-      return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
     } else {
       throw new java.lang.RuntimeException("Cannot get field 'message_blob' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
@@ -568,9 +568,9 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
 
   @Override
   public int compareTo(HBMessageData other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -580,12 +580,12 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -594,8 +594,8 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
   }
   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);
     }
   }
@@ -603,8 +603,8 @@ public class HBMessageData extends org.apache.thrift.TUnion<HBMessageData, HBMes
 
   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);
     }
   }


[48/50] [abbrv] storm git commit: STORM-2882: removed dep declaration

Posted by bo...@apache.org.
STORM-2882: removed dep declaration


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1b9e81f0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1b9e81f0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1b9e81f0

Branch: refs/heads/master
Commit: 1b9e81f0452a584706e9c608ba8b010068724e48
Parents: 91251c5
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 30 12:03:57 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 storm-client/pom.xml | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/1b9e81f0/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index c5004a9..b86a2bd 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -80,12 +80,6 @@
         </dependency>
 
         <!-- below are transitive dependencies which are version managed in storm pom -->
-        <!-- httpclient is derived from thrift -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
index bf37de2..b0b5fae 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentPageInfo.java
@@ -25,28 +25,28 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageInfo, ComponentPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentPageInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentPageInfo");
-
-  private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("component_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField COMPONENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("component_type", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_name", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_stats", org.apache.thrift.protocol.TType.MAP, (short)7);
-  private static final org.apache.thrift.protocol.TField GSID_TO_INPUT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("gsid_to_input_stats", org.apache.thrift.protocol.TType.MAP, (short)8);
-  private static final org.apache.thrift.protocol.TField SID_TO_OUTPUT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("sid_to_output_stats", org.apache.thrift.protocol.TType.MAP, (short)9);
-  private static final org.apache.thrift.protocol.TField EXEC_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("exec_stats", org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)11);
-  private static final org.apache.thrift.protocol.TField EVENTLOG_HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("eventlog_host", org.apache.thrift.protocol.TType.STRING, (short)12);
-  private static final org.apache.thrift.protocol.TField EVENTLOG_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("eventlog_port", org.apache.thrift.protocol.TType.I32, (short)13);
-  private static final org.apache.thrift.protocol.TField DEBUG_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("debug_options", org.apache.thrift.protocol.TType.STRUCT, (short)14);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_status", org.apache.thrift.protocol.TType.STRING, (short)15);
-  private static final org.apache.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("resources_map", org.apache.thrift.protocol.TType.MAP, (short)16);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentPageInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentPageInfoTupleSchemeFactory();
+public class ComponentPageInfo implements org.apache.storm.thrift.TBase<ComponentPageInfo, ComponentPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentPageInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentPageInfo");
+
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_type", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_id", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_name", org.apache.storm.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_executors", org.apache.storm.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_tasks", org.apache.storm.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField WINDOW_TO_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("window_to_stats", org.apache.storm.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField GSID_TO_INPUT_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("gsid_to_input_stats", org.apache.storm.thrift.protocol.TType.MAP, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField SID_TO_OUTPUT_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("sid_to_output_stats", org.apache.storm.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField EXEC_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("exec_stats", org.apache.storm.thrift.protocol.TType.LIST, (short)10);
+  private static final org.apache.storm.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("errors", org.apache.storm.thrift.protocol.TType.LIST, (short)11);
+  private static final org.apache.storm.thrift.protocol.TField EVENTLOG_HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("eventlog_host", org.apache.storm.thrift.protocol.TType.STRING, (short)12);
+  private static final org.apache.storm.thrift.protocol.TField EVENTLOG_PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("eventlog_port", org.apache.storm.thrift.protocol.TType.I32, (short)13);
+  private static final org.apache.storm.thrift.protocol.TField DEBUG_OPTIONS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("debug_options", org.apache.storm.thrift.protocol.TType.STRUCT, (short)14);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_status", org.apache.storm.thrift.protocol.TType.STRING, (short)15);
+  private static final org.apache.storm.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("resources_map", org.apache.storm.thrift.protocol.TType.MAP, (short)16);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentPageInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentPageInfoTupleSchemeFactory();
 
   private java.lang.String component_id; // required
   private ComponentType component_type; // required
@@ -66,7 +66,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
   private java.util.Map<java.lang.String,java.lang.Double> resources_map; // 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 {
     COMPONENT_ID((short)1, "component_id"),
     /**
      * 
@@ -178,53 +178,53 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
   private static final int __EVENTLOG_PORT_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TOPOLOGY_ID,_Fields.TOPOLOGY_NAME,_Fields.NUM_EXECUTORS,_Fields.NUM_TASKS,_Fields.WINDOW_TO_STATS,_Fields.GSID_TO_INPUT_STATS,_Fields.SID_TO_OUTPUT_STATS,_Fields.EXEC_STATS,_Fields.ERRORS,_Fields.EVENTLOG_HOST,_Fields.EVENTLOG_PORT,_Fields.DEBUG_OPTIONS,_Fields.TOPOLOGY_STATUS,_Fields.RESOURCES_MAP};
-  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.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("component_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMPONENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("component_type", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ComponentType.class)));
-    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOPOLOGY_NAME, new org.apache.thrift.meta_data.FieldMetaData("topology_name", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_TASKS, new org.apache.thrift.meta_data.FieldMetaData("num_tasks", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.WINDOW_TO_STATS, new org.apache.thrift.meta_data.FieldMetaData("window_to_stats", 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, ComponentAggregateStats.class))));
-    tmpMap.put(_Fields.GSID_TO_INPUT_STATS, new org.apache.thrift.meta_data.FieldMetaData("gsid_to_input_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentAggregateStats.class))));
-    tmpMap.put(_Fields.SID_TO_OUTPUT_STATS, new org.apache.thrift.meta_data.FieldMetaData("sid_to_output_stats", 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, ComponentAggregateStats.class))));
-    tmpMap.put(_Fields.EXEC_STATS, new org.apache.thrift.meta_data.FieldMetaData("exec_stats", 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, ExecutorAggregateStats.class))));
-    tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", 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, ErrorInfo.class))));
-    tmpMap.put(_Fields.EVENTLOG_HOST, new org.apache.thrift.meta_data.FieldMetaData("eventlog_host", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EVENTLOG_PORT, new org.apache.thrift.meta_data.FieldMetaData("eventlog_port", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debug_options", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DebugOptions.class)));
-    tmpMap.put(_Fields.TOPOLOGY_STATUS, new org.apache.thrift.meta_data.FieldMetaData("topology_status", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCES_MAP, new org.apache.thrift.meta_data.FieldMetaData("resources_map", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
+    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.COMPONENT_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("component_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.COMPONENT_TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("component_type", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, ComponentType.class)));
+    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_id", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOPOLOGY_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_name", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_executors", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_TASKS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_tasks", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.WINDOW_TO_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("window_to_stats", 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, ComponentAggregateStats.class))));
+    tmpMap.put(_Fields.GSID_TO_INPUT_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("gsid_to_input_stats", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentAggregateStats.class))));
+    tmpMap.put(_Fields.SID_TO_OUTPUT_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("sid_to_output_stats", 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, ComponentAggregateStats.class))));
+    tmpMap.put(_Fields.EXEC_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("exec_stats", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorAggregateStats.class))));
+    tmpMap.put(_Fields.ERRORS, new org.apache.storm.thrift.meta_data.FieldMetaData("errors", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ErrorInfo.class))));
+    tmpMap.put(_Fields.EVENTLOG_HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("eventlog_host", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EVENTLOG_PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("eventlog_port", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.storm.thrift.meta_data.FieldMetaData("debug_options", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, DebugOptions.class)));
+    tmpMap.put(_Fields.TOPOLOGY_STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_status", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.RESOURCES_MAP, new org.apache.storm.thrift.meta_data.FieldMetaData("resources_map", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentPageInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentPageInfo.class, metaDataMap);
   }
 
   public ComponentPageInfo() {
@@ -470,16 +470,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
   }
 
   public void unset_num_executors() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_executors() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   public void set_num_executors_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
   }
 
   public int get_num_tasks() {
@@ -492,16 +492,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
   }
 
   public void unset_num_tasks() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   /** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_tasks() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   public void set_num_tasks_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
   }
 
   public int get_window_to_stats_size() {
@@ -715,16 +715,16 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
   }
 
   public void unset_eventlog_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID);
   }
 
   /** Returns true if field eventlog_port is set (has been assigned a value) and false otherwise */
   public boolean is_set_eventlog_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID);
   }
 
   public void set_eventlog_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __EVENTLOG_PORT_ISSET_ID, value);
   }
 
   public DebugOptions get_debug_options() {
@@ -1283,7 +1283,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_component_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, other.component_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_id, other.component_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1293,7 +1293,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_component_type()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_type, other.component_type);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_type, other.component_type);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1303,7 +1303,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_topology_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1313,7 +1313,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_topology_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_name, other.topology_name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_name, other.topology_name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1323,7 +1323,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_num_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1333,7 +1333,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_num_tasks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1343,7 +1343,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_window_to_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_stats, other.window_to_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.window_to_stats, other.window_to_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1353,7 +1353,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_gsid_to_input_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gsid_to_input_stats, other.gsid_to_input_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.gsid_to_input_stats, other.gsid_to_input_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1363,7 +1363,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_sid_to_output_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sid_to_output_stats, other.sid_to_output_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.sid_to_output_stats, other.sid_to_output_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1373,7 +1373,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_exec_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exec_stats, other.exec_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.exec_stats, other.exec_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1383,7 +1383,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_errors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, other.errors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.errors, other.errors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1393,7 +1393,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_eventlog_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eventlog_host, other.eventlog_host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.eventlog_host, other.eventlog_host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1403,7 +1403,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_eventlog_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eventlog_port, other.eventlog_port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.eventlog_port, other.eventlog_port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1413,7 +1413,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_debug_options()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.debug_options, other.debug_options);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.debug_options, other.debug_options);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1423,7 +1423,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_topology_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_status, other.topology_status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_status, other.topology_status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1433,7 +1433,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       return lastComparison;
     }
     if (is_set_resources_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resources_map, other.resources_map);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.resources_map, other.resources_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1445,11 +1445,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
     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);
   }
 
@@ -1605,14 +1605,14 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
     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_component_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'component_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'component_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_component_type()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'component_type' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'component_type' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1623,8 +1623,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
 
   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);
     }
   }
@@ -1633,82 +1633,82 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
     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 ComponentPageInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ComponentPageInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ComponentPageInfoStandardScheme getScheme() {
       return new ComponentPageInfoStandardScheme();
     }
   }
 
-  private static class ComponentPageInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ComponentPageInfo> {
+  private static class ComponentPageInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ComponentPageInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ComponentPageInfo 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: // COMPONENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.component_id = iprot.readString();
               struct.set_component_id_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: // COMPONENT_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.component_type = org.apache.storm.generated.ComponentType.findByValue(iprot.readI32());
               struct.set_component_type_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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_id = iprot.readString();
               struct.set_topology_id_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: // TOPOLOGY_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_name = iprot.readString();
               struct.set_topology_name_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: // NUM_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_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: // NUM_TASKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_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: // WINDOW_TO_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map510 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map510 = iprot.readMapBegin();
                 struct.window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map510.size);
                 java.lang.String _key511;
                 ComponentAggregateStats _val512;
@@ -1723,13 +1723,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               }
               struct.set_window_to_stats_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: // GSID_TO_INPUT_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map514 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map514 = iprot.readMapBegin();
                 struct.gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map514.size);
                 GlobalStreamId _key515;
                 ComponentAggregateStats _val516;
@@ -1745,13 +1745,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               }
               struct.set_gsid_to_input_stats_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: // SID_TO_OUTPUT_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map518 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map518 = iprot.readMapBegin();
                 struct.sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map518.size);
                 java.lang.String _key519;
                 ComponentAggregateStats _val520;
@@ -1766,13 +1766,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               }
               struct.set_sid_to_output_stats_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: // EXEC_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list522 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list522 = iprot.readListBegin();
                 struct.exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(_list522.size);
                 ExecutorAggregateStats _elem523;
                 for (int _i524 = 0; _i524 < _list522.size; ++_i524)
@@ -1785,13 +1785,13 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               }
               struct.set_exec_stats_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 11: // ERRORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list525 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list525 = iprot.readListBegin();
                 struct.errors = new java.util.ArrayList<ErrorInfo>(_list525.size);
                 ErrorInfo _elem526;
                 for (int _i527 = 0; _i527 < _list525.size; ++_i527)
@@ -1804,46 +1804,46 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               }
               struct.set_errors_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 12: // EVENTLOG_HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.eventlog_host = iprot.readString();
               struct.set_eventlog_host_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 13: // EVENTLOG_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.eventlog_port = iprot.readI32();
               struct.set_eventlog_port_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 14: // DEBUG_OPTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.debug_options = new DebugOptions();
               struct.debug_options.read(iprot);
               struct.set_debug_options_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 15: // TOPOLOGY_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_status = iprot.readString();
               struct.set_topology_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 16: // RESOURCES_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map528 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map528 = iprot.readMapBegin();
                 struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map528.size);
                 java.lang.String _key529;
                 double _val530;
@@ -1857,11 +1857,11 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               }
               struct.set_resources_map_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();
       }
@@ -1869,7 +1869,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ComponentPageInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1911,7 +1911,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
         if (struct.is_set_window_to_stats()) {
           oprot.writeFieldBegin(WINDOW_TO_STATS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.window_to_stats.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.window_to_stats.size()));
             for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> _iter532 : struct.window_to_stats.entrySet())
             {
               oprot.writeString(_iter532.getKey());
@@ -1926,7 +1926,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
         if (struct.is_set_gsid_to_input_stats()) {
           oprot.writeFieldBegin(GSID_TO_INPUT_STATS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.gsid_to_input_stats.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, struct.gsid_to_input_stats.size()));
             for (java.util.Map.Entry<GlobalStreamId, ComponentAggregateStats> _iter533 : struct.gsid_to_input_stats.entrySet())
             {
               _iter533.getKey().write(oprot);
@@ -1941,7 +1941,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
         if (struct.is_set_sid_to_output_stats()) {
           oprot.writeFieldBegin(SID_TO_OUTPUT_STATS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.sid_to_output_stats.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.sid_to_output_stats.size()));
             for (java.util.Map.Entry<java.lang.String, ComponentAggregateStats> _iter534 : struct.sid_to_output_stats.entrySet())
             {
               oprot.writeString(_iter534.getKey());
@@ -1956,7 +1956,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
         if (struct.is_set_exec_stats()) {
           oprot.writeFieldBegin(EXEC_STATS_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.exec_stats.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.exec_stats.size()));
             for (ExecutorAggregateStats _iter535 : struct.exec_stats)
             {
               _iter535.write(oprot);
@@ -1970,7 +1970,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
         if (struct.is_set_errors()) {
           oprot.writeFieldBegin(ERRORS_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.errors.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.errors.size()));
             for (ErrorInfo _iter536 : struct.errors)
             {
               _iter536.write(oprot);
@@ -2010,7 +2010,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
         if (struct.is_set_resources_map()) {
           oprot.writeFieldBegin(RESOURCES_MAP_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter537 : struct.resources_map.entrySet())
             {
               oprot.writeString(_iter537.getKey());
@@ -2027,17 +2027,17 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
 
   }
 
-  private static class ComponentPageInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ComponentPageInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ComponentPageInfoTupleScheme getScheme() {
       return new ComponentPageInfoTupleScheme();
     }
   }
 
-  private static class ComponentPageInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<ComponentPageInfo> {
+  private static class ComponentPageInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ComponentPageInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo 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, ComponentPageInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.component_id);
       oprot.writeI32(struct.component_type.getValue());
       java.util.BitSet optionals = new java.util.BitSet();
@@ -2169,8 +2169,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo 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, ComponentPageInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.component_id = iprot.readString();
       struct.set_component_id_isSet(true);
       struct.component_type = org.apache.storm.generated.ComponentType.findByValue(iprot.readI32());
@@ -2194,7 +2194,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TMap _map544 = 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 _map544 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.window_to_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map544.size);
           java.lang.String _key545;
           ComponentAggregateStats _val546;
@@ -2210,7 +2210,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TMap _map548 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map548 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.gsid_to_input_stats = new java.util.HashMap<GlobalStreamId,ComponentAggregateStats>(2*_map548.size);
           GlobalStreamId _key549;
           ComponentAggregateStats _val550;
@@ -2227,7 +2227,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TMap _map552 = 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 _map552 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.sid_to_output_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map552.size);
           java.lang.String _key553;
           ComponentAggregateStats _val554;
@@ -2243,7 +2243,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       }
       if (incoming.get(7)) {
         {
-          org.apache.thrift.protocol.TList _list556 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list556 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.exec_stats = new java.util.ArrayList<ExecutorAggregateStats>(_list556.size);
           ExecutorAggregateStats _elem557;
           for (int _i558 = 0; _i558 < _list556.size; ++_i558)
@@ -2257,7 +2257,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list559 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list559 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.errors = new java.util.ArrayList<ErrorInfo>(_list559.size);
           ErrorInfo _elem560;
           for (int _i561 = 0; _i561 < _list559.size; ++_i561)
@@ -2288,7 +2288,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
       }
       if (incoming.get(13)) {
         {
-          org.apache.thrift.protocol.TMap _map562 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map562 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map562.size);
           java.lang.String _key563;
           double _val564;
@@ -2304,8 +2304,8 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
     }
   }
 
-  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/ComponentType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java
index 0c8a57e..334960f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentType.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum ComponentType implements org.apache.thrift.TEnum {
+public enum ComponentType implements org.apache.storm.thrift.TEnum {
   BOLT(1),
   SPOUT(2);
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Credentials.java b/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
index e4e7418..fca863b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Credentials.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
+public class Credentials implements org.apache.storm.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Credentials");
 
-  private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", org.apache.thrift.protocol.TType.MAP, (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.MAP, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CredentialsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CredentialsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CredentialsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CredentialsTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,java.lang.String> creds; // 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 {
     CREDS((short)1, "creds");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,15 +94,15 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
   }
 
   // isset id assignments
-  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.CREDS, new org.apache.thrift.meta_data.FieldMetaData("creds", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    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.CREDS, new org.apache.storm.thrift.meta_data.FieldMetaData("creds", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Credentials.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Credentials.class, metaDataMap);
   }
 
   public Credentials() {
@@ -254,7 +254,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
       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;
       }
@@ -266,11 +266,11 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
     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);
   }
 
@@ -290,10 +290,10 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
     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_creds()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'creds' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'creds' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -301,42 +301,42 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
 
   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 CredentialsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class CredentialsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public CredentialsStandardScheme getScheme() {
       return new CredentialsStandardScheme();
     }
   }
 
-  private static class CredentialsStandardScheme extends org.apache.thrift.scheme.StandardScheme<Credentials> {
+  private static class CredentialsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<Credentials> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, Credentials 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: // CREDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map596 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map596 = iprot.readMapBegin();
                 struct.creds = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map596.size);
                 java.lang.String _key597;
                 java.lang.String _val598;
@@ -350,11 +350,11 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
               }
               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();
       }
@@ -362,14 +362,14 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, Credentials struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, Credentials struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.creds != null) {
         oprot.writeFieldBegin(CREDS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, struct.creds.size()));
           for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter600 : struct.creds.entrySet())
           {
             oprot.writeString(_iter600.getKey());
@@ -385,17 +385,17 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
 
   }
 
-  private static class CredentialsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class CredentialsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public CredentialsTupleScheme getScheme() {
       return new CredentialsTupleScheme();
     }
   }
 
-  private static class CredentialsTupleScheme extends org.apache.thrift.scheme.TupleScheme<Credentials> {
+  private static class CredentialsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<Credentials> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Credentials 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, Credentials struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.creds.size());
         for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter601 : struct.creds.entrySet())
@@ -407,10 +407,10 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Credentials 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, Credentials 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 _map602 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map602 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
         struct.creds = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map602.size);
         java.lang.String _key603;
         java.lang.String _val604;
@@ -425,8 +425,8 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
     }
   }
 
-  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/DRPCExceptionType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java b/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java
index 44bf0cb..a83e84c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DRPCExceptionType.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum DRPCExceptionType implements org.apache.thrift.TEnum {
+public enum DRPCExceptionType implements org.apache.storm.thrift.TEnum {
   INTERNAL_ERROR(0),
   SERVER_SHUTDOWN(1),
   SERVER_TIMEOUT(2),


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
index 83a7fae..15f351e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentAggregateStats.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ComponentAggregateStats implements org.apache.thrift.TBase<ComponentAggregateStats, ComponentAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentAggregateStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentAggregateStats");
+public class ComponentAggregateStats implements org.apache.storm.thrift.TBase<ComponentAggregateStats, ComponentAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentAggregateStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField COMMON_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("common_stats", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField SPECIFIC_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("specific_stats", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField LAST_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("last_error", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("type", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMMON_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("common_stats", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SPECIFIC_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("specific_stats", org.apache.storm.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField LAST_ERROR_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("last_error", org.apache.storm.thrift.protocol.TType.STRUCT, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentAggregateStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentAggregateStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentAggregateStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentAggregateStatsTupleSchemeFactory();
 
   private ComponentType type; // optional
   private CommonAggregateStats common_stats; // optional
@@ -42,7 +42,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
   private ErrorInfo last_error; // 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 ComponentType
@@ -114,19 +114,19 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.TYPE,_Fields.COMMON_STATS,_Fields.SPECIFIC_STATS,_Fields.LAST_ERROR};
-  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.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ComponentType.class)));
-    tmpMap.put(_Fields.COMMON_STATS, new org.apache.thrift.meta_data.FieldMetaData("common_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CommonAggregateStats.class)));
-    tmpMap.put(_Fields.SPECIFIC_STATS, new org.apache.thrift.meta_data.FieldMetaData("specific_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SpecificAggregateStats.class)));
-    tmpMap.put(_Fields.LAST_ERROR, new org.apache.thrift.meta_data.FieldMetaData("last_error", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ErrorInfo.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.TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("type", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, ComponentType.class)));
+    tmpMap.put(_Fields.COMMON_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("common_stats", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, CommonAggregateStats.class)));
+    tmpMap.put(_Fields.SPECIFIC_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("specific_stats", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SpecificAggregateStats.class)));
+    tmpMap.put(_Fields.LAST_ERROR, new org.apache.storm.thrift.meta_data.FieldMetaData("last_error", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ErrorInfo.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentAggregateStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentAggregateStats.class, metaDataMap);
   }
 
   public ComponentAggregateStats() {
@@ -426,7 +426,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
       return lastComparison;
     }
     if (is_set_type()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -436,7 +436,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
       return lastComparison;
     }
     if (is_set_common_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common_stats, other.common_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.common_stats, other.common_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -446,7 +446,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
       return lastComparison;
     }
     if (is_set_specific_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific_stats, other.specific_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.specific_stats, other.specific_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -456,7 +456,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
       return lastComparison;
     }
     if (is_set_last_error()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.last_error, other.last_error);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.last_error, other.last_error);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -468,11 +468,11 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
     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);
   }
 
@@ -524,7 +524,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
     if (common_stats != null) {
@@ -537,75 +537,75 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
 
   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 ComponentAggregateStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ComponentAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ComponentAggregateStatsStandardScheme getScheme() {
       return new ComponentAggregateStatsStandardScheme();
     }
   }
 
-  private static class ComponentAggregateStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ComponentAggregateStats> {
+  private static class ComponentAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ComponentAggregateStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentAggregateStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ComponentAggregateStats 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: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.type = org.apache.storm.generated.ComponentType.findByValue(iprot.readI32());
               struct.set_type_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: // COMMON_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.common_stats = new CommonAggregateStats();
               struct.common_stats.read(iprot);
               struct.set_common_stats_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: // SPECIFIC_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.specific_stats = new SpecificAggregateStats();
               struct.specific_stats.read(iprot);
               struct.set_specific_stats_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: // LAST_ERROR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.last_error = new ErrorInfo();
               struct.last_error.read(iprot);
               struct.set_last_error_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();
       }
@@ -613,7 +613,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentAggregateStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ComponentAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -651,17 +651,17 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
 
   }
 
-  private static class ComponentAggregateStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ComponentAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ComponentAggregateStatsTupleScheme getScheme() {
       return new ComponentAggregateStatsTupleScheme();
     }
   }
 
-  private static class ComponentAggregateStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ComponentAggregateStats> {
+  private static class ComponentAggregateStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ComponentAggregateStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ComponentAggregateStats 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, ComponentAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_type()) {
         optionals.set(0);
@@ -691,8 +691,8 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ComponentAggregateStats 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, ComponentAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.type = org.apache.storm.generated.ComponentType.findByValue(iprot.readI32());
@@ -716,8 +716,8 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
     }
   }
 
-  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/ComponentCommon.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
index 1d83ce3..ef905c7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentCommon.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon");
+public class ComponentCommon implements org.apache.storm.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentCommon");
 
-  private static final org.apache.thrift.protocol.TField INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("inputs", org.apache.thrift.protocol.TType.MAP, (short)1);
-  private static final org.apache.thrift.protocol.TField STREAMS_FIELD_DESC = new org.apache.thrift.protocol.TField("streams", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField PARALLELISM_HINT_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism_hint", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("json_conf", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField INPUTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("inputs", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField STREAMS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("streams", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField PARALLELISM_HINT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("parallelism_hint", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("json_conf", org.apache.storm.thrift.protocol.TType.STRING, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentCommonStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentCommonTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComponentCommonStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComponentCommonTupleSchemeFactory();
 
   private java.util.Map<GlobalStreamId,Grouping> inputs; // required
   private java.util.Map<java.lang.String,StreamInfo> streams; // required
@@ -42,7 +42,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
   private java.lang.String json_conf; // 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 {
     INPUTS((short)1, "inputs"),
     STREAMS((short)2, "streams"),
     PARALLELISM_HINT((short)3, "parallelism_hint"),
@@ -112,23 +112,23 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
   private static final int __PARALLELISM_HINT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.PARALLELISM_HINT,_Fields.JSON_CONF};
-  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.INPUTS, new org.apache.thrift.meta_data.FieldMetaData("inputs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Grouping.class))));
-    tmpMap.put(_Fields.STREAMS, new org.apache.thrift.meta_data.FieldMetaData("streams", 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, StreamInfo.class))));
-    tmpMap.put(_Fields.PARALLELISM_HINT, new org.apache.thrift.meta_data.FieldMetaData("parallelism_hint", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.JSON_CONF, new org.apache.thrift.meta_data.FieldMetaData("json_conf", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.INPUTS, new org.apache.storm.thrift.meta_data.FieldMetaData("inputs", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, Grouping.class))));
+    tmpMap.put(_Fields.STREAMS, new org.apache.storm.thrift.meta_data.FieldMetaData("streams", 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, StreamInfo.class))));
+    tmpMap.put(_Fields.PARALLELISM_HINT, new org.apache.storm.thrift.meta_data.FieldMetaData("parallelism_hint", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.JSON_CONF, new org.apache.storm.thrift.meta_data.FieldMetaData("json_conf", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentCommon.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentCommon.class, metaDataMap);
   }
 
   public ComponentCommon() {
@@ -275,16 +275,16 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
   }
 
   public void unset_parallelism_hint() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
   }
 
   /** Returns true if field parallelism_hint is set (has been assigned a value) and false otherwise */
   public boolean is_set_parallelism_hint() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
   }
 
   public void set_parallelism_hint_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID, value);
   }
 
   public java.lang.String get_json_conf() {
@@ -474,7 +474,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       return lastComparison;
     }
     if (is_set_inputs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputs, other.inputs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.inputs, other.inputs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -484,7 +484,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       return lastComparison;
     }
     if (is_set_streams()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streams, other.streams);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.streams, other.streams);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -494,7 +494,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       return lastComparison;
     }
     if (is_set_parallelism_hint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallelism_hint, other.parallelism_hint);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.parallelism_hint, other.parallelism_hint);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -504,7 +504,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       return lastComparison;
     }
     if (is_set_json_conf()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.json_conf, other.json_conf);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.json_conf, other.json_conf);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -516,11 +516,11 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
     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);
   }
 
@@ -564,14 +564,14 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
     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_inputs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'inputs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'inputs' is unset! Struct:" + toString());
     }
 
     if (!is_set_streams()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'streams' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'streams' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -579,8 +579,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
 
   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);
     }
   }
@@ -589,34 +589,34 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
     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 ComponentCommonStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ComponentCommonStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ComponentCommonStandardScheme getScheme() {
       return new ComponentCommonStandardScheme();
     }
   }
 
-  private static class ComponentCommonStandardScheme extends org.apache.thrift.scheme.StandardScheme<ComponentCommon> {
+  private static class ComponentCommonStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ComponentCommon> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentCommon struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ComponentCommon 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: // INPUTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map24 = iprot.readMapBegin();
                 struct.inputs = new java.util.HashMap<GlobalStreamId,Grouping>(2*_map24.size);
                 GlobalStreamId _key25;
                 Grouping _val26;
@@ -632,13 +632,13 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
               }
               struct.set_inputs_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: // STREAMS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map28 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map28 = iprot.readMapBegin();
                 struct.streams = new java.util.HashMap<java.lang.String,StreamInfo>(2*_map28.size);
                 java.lang.String _key29;
                 StreamInfo _val30;
@@ -653,27 +653,27 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
               }
               struct.set_streams_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: // PARALLELISM_HINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.parallelism_hint = iprot.readI32();
               struct.set_parallelism_hint_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: // JSON_CONF
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.json_conf = iprot.readString();
               struct.set_json_conf_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();
       }
@@ -681,14 +681,14 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentCommon struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ComponentCommon struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.inputs != null) {
         oprot.writeFieldBegin(INPUTS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.inputs.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, struct.inputs.size()));
           for (java.util.Map.Entry<GlobalStreamId, Grouping> _iter32 : struct.inputs.entrySet())
           {
             _iter32.getKey().write(oprot);
@@ -701,7 +701,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       if (struct.streams != null) {
         oprot.writeFieldBegin(STREAMS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.streams.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.streams.size()));
           for (java.util.Map.Entry<java.lang.String, StreamInfo> _iter33 : struct.streams.entrySet())
           {
             oprot.writeString(_iter33.getKey());
@@ -729,17 +729,17 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
 
   }
 
-  private static class ComponentCommonTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ComponentCommonTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ComponentCommonTupleScheme getScheme() {
       return new ComponentCommonTupleScheme();
     }
   }
 
-  private static class ComponentCommonTupleScheme extends org.apache.thrift.scheme.TupleScheme<ComponentCommon> {
+  private static class ComponentCommonTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ComponentCommon> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ComponentCommon 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, ComponentCommon struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.inputs.size());
         for (java.util.Map.Entry<GlobalStreamId, Grouping> _iter34 : struct.inputs.entrySet())
@@ -773,10 +773,10 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ComponentCommon 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, ComponentCommon 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 _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map36 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.inputs = new java.util.HashMap<GlobalStreamId,Grouping>(2*_map36.size);
         GlobalStreamId _key37;
         Grouping _val38;
@@ -791,7 +791,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
       }
       struct.set_inputs_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map40 = 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 _map40 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.streams = new java.util.HashMap<java.lang.String,StreamInfo>(2*_map40.size);
         java.lang.String _key41;
         StreamInfo _val42;
@@ -816,8 +816,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
     }
   }
 
-  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/ComponentObject.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java b/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
index 3ec8fee..c8338c0 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ComponentObject.java
@@ -24,14 +24,14 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, ComponentObject._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentObject");
-  private static final org.apache.thrift.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.thrift.protocol.TField("serialized_java", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SHELL_FIELD_DESC = new org.apache.thrift.protocol.TField("shell", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField JAVA_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("java_object", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+public class ComponentObject extends org.apache.storm.thrift.TUnion<ComponentObject, ComponentObject._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ComponentObject");
+  private static final org.apache.storm.thrift.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("serialized_java", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SHELL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("shell", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField JAVA_OBJECT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("java_object", org.apache.storm.thrift.protocol.TType.STRUCT, (short)3);
 
   /** 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 {
     SERIALIZED_JAVA((short)1, "serialized_java"),
     SHELL((short)2, "shell"),
     JAVA_OBJECT((short)3, "java_object");
@@ -94,17 +94,17 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
     }
   }
 
-  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.SERIALIZED_JAVA, new org.apache.thrift.meta_data.FieldMetaData("serialized_java", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.SHELL, new org.apache.thrift.meta_data.FieldMetaData("shell", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ShellComponent.class)));
-    tmpMap.put(_Fields.JAVA_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("java_object", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JavaObject.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.SERIALIZED_JAVA, new org.apache.storm.thrift.meta_data.FieldMetaData("serialized_java", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.SHELL, new org.apache.storm.thrift.meta_data.FieldMetaData("shell", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ShellComponent.class)));
+    tmpMap.put(_Fields.JAVA_OBJECT, new org.apache.storm.thrift.meta_data.FieldMetaData("java_object", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, JavaObject.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentObject.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComponentObject.class, metaDataMap);
   }
 
   public ComponentObject() {
@@ -171,7 +171,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -181,7 +181,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
             serialized_java = iprot.readBinary();
             return serialized_java;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case SHELL:
@@ -191,7 +191,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
             shell.read(iprot);
             return shell;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case JAVA_OBJECT:
@@ -201,20 +201,20 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
             java_object.read(iprot);
             return java_object;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case SERIALIZED_JAVA:
         java.nio.ByteBuffer serialized_java = (java.nio.ByteBuffer)value_;
@@ -234,7 +234,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
@@ -256,12 +256,12 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case SERIALIZED_JAVA:
         java.nio.ByteBuffer serialized_java = (java.nio.ByteBuffer)value_;
@@ -281,7 +281,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case SERIALIZED_JAVA:
         return SERIALIZED_JAVA_FIELD_DESC;
@@ -295,7 +295,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -310,14 +310,14 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
 
 
   public byte[] get_serialized_java() {
-    set_serialized_java(org.apache.thrift.TBaseHelper.rightSize(buffer_for_serialized_java()));
+    set_serialized_java(org.apache.storm.thrift.TBaseHelper.rightSize(buffer_for_serialized_java()));
     java.nio.ByteBuffer b = buffer_for_serialized_java();
     return b == null ? null : b.array();
   }
 
   public java.nio.ByteBuffer buffer_for_serialized_java() {
     if (getSetField() == _Fields.SERIALIZED_JAVA) {
-      return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
     } else {
       throw new java.lang.RuntimeException("Cannot get field 'serialized_java' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
@@ -390,9 +390,9 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
 
   @Override
   public int compareTo(ComponentObject other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -402,12 +402,12 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -416,8 +416,8 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
   }
   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);
     }
   }
@@ -425,8 +425,8 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
 
   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);
     }
   }


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/PrivateWorkerKey.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/PrivateWorkerKey.java b/storm-client/src/jvm/org/apache/storm/generated/PrivateWorkerKey.java
index 27a22c2..1de3f24 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/PrivateWorkerKey.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/PrivateWorkerKey.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 PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKey, PrivateWorkerKey._Fields>, java.io.Serializable, Cloneable, Comparable<PrivateWorkerKey> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivateWorkerKey");
+public class PrivateWorkerKey implements org.apache.storm.thrift.TBase<PrivateWorkerKey, PrivateWorkerKey._Fields>, java.io.Serializable, Cloneable, Comparable<PrivateWorkerKey> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("PrivateWorkerKey");
 
-  private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField EXPIRATION_TIME_MILLIS_FIELD_DESC = new org.apache.thrift.protocol.TField("expirationTimeMillis", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("key", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("userName", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EXPIRATION_TIME_MILLIS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("expirationTimeMillis", org.apache.storm.thrift.protocol.TType.I64, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PrivateWorkerKeyStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PrivateWorkerKeyTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PrivateWorkerKeyStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PrivateWorkerKeyTupleSchemeFactory();
 
   private java.nio.ByteBuffer key; // required
   private java.lang.String userName; // required
   private long expirationTimeMillis; // 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 {
     KEY((short)1, "key"),
     USER_NAME((short)2, "userName"),
     EXPIRATION_TIME_MILLIS((short)3, "expirationTimeMillis");
@@ -106,17 +106,17 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
   // isset id assignments
   private static final int __EXPIRATIONTIMEMILLIS_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.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EXPIRATION_TIME_MILLIS, new org.apache.thrift.meta_data.FieldMetaData("expirationTimeMillis", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    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.KEY, new org.apache.storm.thrift.meta_data.FieldMetaData("key", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.USER_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("userName", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EXPIRATION_TIME_MILLIS, new org.apache.storm.thrift.meta_data.FieldMetaData("expirationTimeMillis", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrivateWorkerKey.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrivateWorkerKey.class, metaDataMap);
   }
 
   public PrivateWorkerKey() {
@@ -128,7 +128,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     long expirationTimeMillis)
   {
     this();
-    this.key = org.apache.thrift.TBaseHelper.copyBinary(key);
+    this.key = org.apache.storm.thrift.TBaseHelper.copyBinary(key);
     this.userName = userName;
     this.expirationTimeMillis = expirationTimeMillis;
     set_expirationTimeMillis_isSet(true);
@@ -140,7 +140,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
   public PrivateWorkerKey(PrivateWorkerKey other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.is_set_key()) {
-      this.key = org.apache.thrift.TBaseHelper.copyBinary(other.key);
+      this.key = org.apache.storm.thrift.TBaseHelper.copyBinary(other.key);
     }
     if (other.is_set_userName()) {
       this.userName = other.userName;
@@ -161,12 +161,12 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
   }
 
   public byte[] get_key() {
-    set_key(org.apache.thrift.TBaseHelper.rightSize(key));
+    set_key(org.apache.storm.thrift.TBaseHelper.rightSize(key));
     return key == null ? null : key.array();
   }
 
   public java.nio.ByteBuffer buffer_for_key() {
-    return org.apache.thrift.TBaseHelper.copyBinary(key);
+    return org.apache.storm.thrift.TBaseHelper.copyBinary(key);
   }
 
   public void set_key(byte[] key) {
@@ -174,7 +174,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
   }
 
   public void set_key(java.nio.ByteBuffer key) {
-    this.key = org.apache.thrift.TBaseHelper.copyBinary(key);
+    this.key = org.apache.storm.thrift.TBaseHelper.copyBinary(key);
   }
 
   public void unset_key() {
@@ -225,16 +225,16 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
   }
 
   public void unset_expirationTimeMillis() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
   }
 
   /** Returns true if field expirationTimeMillis is set (has been assigned a value) and false otherwise */
   public boolean is_set_expirationTimeMillis() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
   }
 
   public void set_expirationTimeMillis_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -359,7 +359,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     if (is_set_userName())
       hashCode = hashCode * 8191 + userName.hashCode();
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(expirationTimeMillis);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(expirationTimeMillis);
 
     return hashCode;
   }
@@ -377,7 +377,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
       return lastComparison;
     }
     if (is_set_key()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.key, other.key);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -387,7 +387,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
       return lastComparison;
     }
     if (is_set_userName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, other.userName);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.userName, other.userName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -397,7 +397,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
       return lastComparison;
     }
     if (is_set_expirationTimeMillis()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expirationTimeMillis, other.expirationTimeMillis);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.expirationTimeMillis, other.expirationTimeMillis);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -409,11 +409,11 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     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);
   }
 
@@ -426,7 +426,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     if (this.key == null) {
       sb.append("null");
     } else {
-      org.apache.thrift.TBaseHelper.toString(this.key, sb);
+      org.apache.storm.thrift.TBaseHelper.toString(this.key, sb);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -445,18 +445,18 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     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_key()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'key' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'key' is unset! Struct:" + toString());
     }
 
     if (!is_set_userName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
     }
 
     if (!is_set_expirationTimeMillis()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'expirationTimeMillis' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'expirationTimeMillis' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -464,8 +464,8 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
 
   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);
     }
   }
@@ -474,56 +474,56 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     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 PrivateWorkerKeyStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class PrivateWorkerKeyStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public PrivateWorkerKeyStandardScheme getScheme() {
       return new PrivateWorkerKeyStandardScheme();
     }
   }
 
-  private static class PrivateWorkerKeyStandardScheme extends org.apache.thrift.scheme.StandardScheme<PrivateWorkerKey> {
+  private static class PrivateWorkerKeyStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<PrivateWorkerKey> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, PrivateWorkerKey struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, PrivateWorkerKey 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: // KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.key = iprot.readBinary();
               struct.set_key_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: // USER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.userName = iprot.readString();
               struct.set_userName_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: // EXPIRATION_TIME_MILLIS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.expirationTimeMillis = iprot.readI64();
               struct.set_expirationTimeMillis_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();
       }
@@ -531,7 +531,7 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, PrivateWorkerKey struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, PrivateWorkerKey struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -554,25 +554,25 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
 
   }
 
-  private static class PrivateWorkerKeyTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class PrivateWorkerKeyTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public PrivateWorkerKeyTupleScheme getScheme() {
       return new PrivateWorkerKeyTupleScheme();
     }
   }
 
-  private static class PrivateWorkerKeyTupleScheme extends org.apache.thrift.scheme.TupleScheme<PrivateWorkerKey> {
+  private static class PrivateWorkerKeyTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<PrivateWorkerKey> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, PrivateWorkerKey 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, PrivateWorkerKey struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeBinary(struct.key);
       oprot.writeString(struct.userName);
       oprot.writeI64(struct.expirationTimeMillis);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, PrivateWorkerKey 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, PrivateWorkerKey struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.key = iprot.readBinary();
       struct.set_key_isSet(true);
       struct.userName = iprot.readString();
@@ -582,8 +582,8 @@ public class PrivateWorkerKey implements org.apache.thrift.TBase<PrivateWorkerKe
     }
   }
 
-  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/ProfileAction.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ProfileAction.java b/storm-client/src/jvm/org/apache/storm/generated/ProfileAction.java
index 8581b8a..929dfcf 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ProfileAction.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ProfileAction.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum ProfileAction implements org.apache.thrift.TEnum {
+public enum ProfileAction implements org.apache.storm.thrift.TEnum {
   JPROFILE_STOP(0),
   JPROFILE_START(1),
   JPROFILE_DUMP(2),

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java b/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java
index a335083..f656b43 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ProfileRequest.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 ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, ProfileRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ProfileRequest> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProfileRequest");
+public class ProfileRequest implements org.apache.storm.thrift.TBase<ProfileRequest, ProfileRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ProfileRequest> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ProfileRequest");
 
-  private static final org.apache.thrift.protocol.TField NODE_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("nodeInfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField ACTION_FIELD_DESC = new org.apache.thrift.protocol.TField("action", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField TIME_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("time_stamp", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField NODE_INFO_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("nodeInfo", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField ACTION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("action", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TIME_STAMP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_stamp", org.apache.storm.thrift.protocol.TType.I64, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ProfileRequestStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ProfileRequestTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ProfileRequestStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ProfileRequestTupleSchemeFactory();
 
   private NodeInfo nodeInfo; // required
   private ProfileAction action; // required
   private long time_stamp; // 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 {
     NODE_INFO((short)1, "nodeInfo"),
     /**
      * 
@@ -111,17 +111,17 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
   private static final int __TIME_STAMP_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TIME_STAMP};
-  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.NODE_INFO, new org.apache.thrift.meta_data.FieldMetaData("nodeInfo", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeInfo.class)));
-    tmpMap.put(_Fields.ACTION, new org.apache.thrift.meta_data.FieldMetaData("action", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ProfileAction.class)));
-    tmpMap.put(_Fields.TIME_STAMP, new org.apache.thrift.meta_data.FieldMetaData("time_stamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    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.NODE_INFO, new org.apache.storm.thrift.meta_data.FieldMetaData("nodeInfo", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NodeInfo.class)));
+    tmpMap.put(_Fields.ACTION, new org.apache.storm.thrift.meta_data.FieldMetaData("action", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, ProfileAction.class)));
+    tmpMap.put(_Fields.TIME_STAMP, new org.apache.storm.thrift.meta_data.FieldMetaData("time_stamp", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProfileRequest.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProfileRequest.class, metaDataMap);
   }
 
   public ProfileRequest() {
@@ -226,16 +226,16 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
   }
 
   public void unset_time_stamp() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
   }
 
   /** Returns true if field time_stamp is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_stamp() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
   }
 
   public void set_time_stamp_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_STAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_STAMP_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -358,7 +358,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
 
     hashCode = hashCode * 8191 + ((is_set_time_stamp()) ? 131071 : 524287);
     if (is_set_time_stamp())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(time_stamp);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(time_stamp);
 
     return hashCode;
   }
@@ -376,7 +376,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
       return lastComparison;
     }
     if (is_set_nodeInfo()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nodeInfo, other.nodeInfo);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.nodeInfo, other.nodeInfo);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -386,7 +386,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
       return lastComparison;
     }
     if (is_set_action()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.action, other.action);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.action, other.action);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -396,7 +396,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
       return lastComparison;
     }
     if (is_set_time_stamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_stamp, other.time_stamp);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_stamp, other.time_stamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -408,11 +408,11 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
     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);
   }
 
@@ -446,14 +446,14 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
     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_nodeInfo()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'nodeInfo' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'nodeInfo' is unset! Struct:" + toString());
     }
 
     if (!is_set_action()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'action' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'action' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -464,8 +464,8 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
 
   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);
     }
   }
@@ -474,57 +474,57 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
     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 ProfileRequestStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ProfileRequestStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ProfileRequestStandardScheme getScheme() {
       return new ProfileRequestStandardScheme();
     }
   }
 
-  private static class ProfileRequestStandardScheme extends org.apache.thrift.scheme.StandardScheme<ProfileRequest> {
+  private static class ProfileRequestStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ProfileRequest> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ProfileRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ProfileRequest 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: // NODE_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.nodeInfo = new NodeInfo();
               struct.nodeInfo.read(iprot);
               struct.set_nodeInfo_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: // ACTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.action = org.apache.storm.generated.ProfileAction.findByValue(iprot.readI32());
               struct.set_action_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: // TIME_STAMP
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.time_stamp = iprot.readI64();
               struct.set_time_stamp_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();
       }
@@ -532,7 +532,7 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ProfileRequest struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ProfileRequest struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -557,17 +557,17 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
 
   }
 
-  private static class ProfileRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ProfileRequestTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ProfileRequestTupleScheme getScheme() {
       return new ProfileRequestTupleScheme();
     }
   }
 
-  private static class ProfileRequestTupleScheme extends org.apache.thrift.scheme.TupleScheme<ProfileRequest> {
+  private static class ProfileRequestTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ProfileRequest> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ProfileRequest 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, ProfileRequest struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.nodeInfo.write(oprot);
       oprot.writeI32(struct.action.getValue());
       java.util.BitSet optionals = new java.util.BitSet();
@@ -581,8 +581,8 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ProfileRequest 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, ProfileRequest struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.nodeInfo = new NodeInfo();
       struct.nodeInfo.read(iprot);
       struct.set_nodeInfo_isSet(true);
@@ -596,8 +596,8 @@ public class ProfileRequest implements org.apache.thrift.TBase<ProfileRequest, P
     }
   }
 
-  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/ReadableBlobMeta.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java b/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java
index 6488d62..38bb988 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ReadableBlobMeta.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 ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMeta, ReadableBlobMeta._Fields>, java.io.Serializable, Cloneable, Comparable<ReadableBlobMeta> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReadableBlobMeta");
+public class ReadableBlobMeta implements org.apache.storm.thrift.TBase<ReadableBlobMeta, ReadableBlobMeta._Fields>, java.io.Serializable, Cloneable, Comparable<ReadableBlobMeta> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ReadableBlobMeta");
 
-  private static final org.apache.thrift.protocol.TField SETTABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("settable", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SETTABLE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("settable", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("version", org.apache.storm.thrift.protocol.TType.I64, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ReadableBlobMetaStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ReadableBlobMetaTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ReadableBlobMetaStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ReadableBlobMetaTupleSchemeFactory();
 
   private SettableBlobMeta settable; // required
   private long version; // 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 {
     SETTABLE((short)1, "settable"),
     VERSION((short)2, "version");
 
@@ -101,15 +101,15 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
   // isset id assignments
   private static final int __VERSION_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.SETTABLE, new org.apache.thrift.meta_data.FieldMetaData("settable", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SettableBlobMeta.class)));
-    tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    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.SETTABLE, new org.apache.storm.thrift.meta_data.FieldMetaData("settable", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SettableBlobMeta.class)));
+    tmpMap.put(_Fields.VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("version", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ReadableBlobMeta.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ReadableBlobMeta.class, metaDataMap);
   }
 
   public ReadableBlobMeta() {
@@ -180,16 +180,16 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
   }
 
   public void unset_version() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   /** Returns true if field version is set (has been assigned a value) and false otherwise */
   public boolean is_set_version() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   public void set_version_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -284,7 +284,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
     if (is_set_settable())
       hashCode = hashCode * 8191 + settable.hashCode();
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(version);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(version);
 
     return hashCode;
   }
@@ -302,7 +302,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
       return lastComparison;
     }
     if (is_set_settable()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.settable, other.settable);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.settable, other.settable);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
       return lastComparison;
     }
     if (is_set_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.version, other.version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
     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);
   }
 
@@ -352,14 +352,14 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
     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_settable()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'settable' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'settable' is unset! Struct:" + toString());
     }
 
     if (!is_set_version()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -370,8 +370,8 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
 
   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);
     }
   }
@@ -380,49 +380,49 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
     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 ReadableBlobMetaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ReadableBlobMetaStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ReadableBlobMetaStandardScheme getScheme() {
       return new ReadableBlobMetaStandardScheme();
     }
   }
 
-  private static class ReadableBlobMetaStandardScheme extends org.apache.thrift.scheme.StandardScheme<ReadableBlobMeta> {
+  private static class ReadableBlobMetaStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ReadableBlobMeta> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ReadableBlobMeta struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ReadableBlobMeta 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: // SETTABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.settable = new SettableBlobMeta();
               struct.settable.read(iprot);
               struct.set_settable_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: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.version = iprot.readI64();
               struct.set_version_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();
       }
@@ -430,7 +430,7 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ReadableBlobMeta struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ReadableBlobMeta struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -448,24 +448,24 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
 
   }
 
-  private static class ReadableBlobMetaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ReadableBlobMetaTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ReadableBlobMetaTupleScheme getScheme() {
       return new ReadableBlobMetaTupleScheme();
     }
   }
 
-  private static class ReadableBlobMetaTupleScheme extends org.apache.thrift.scheme.TupleScheme<ReadableBlobMeta> {
+  private static class ReadableBlobMetaTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ReadableBlobMeta> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ReadableBlobMeta 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, ReadableBlobMeta struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.settable.write(oprot);
       oprot.writeI64(struct.version);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ReadableBlobMeta 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, ReadableBlobMeta struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.settable = new SettableBlobMeta();
       struct.settable.read(iprot);
       struct.set_settable_isSet(true);
@@ -474,8 +474,8 @@ public class ReadableBlobMeta implements org.apache.thrift.TBase<ReadableBlobMet
     }
   }
 
-  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/RebalanceOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java b/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
index 3060c90..643879d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions");
+public class RebalanceOptions implements org.apache.storm.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("RebalanceOptions");
 
-  private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.MAP, (short)3);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_RESOURCES_OVERRIDES_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_resources_overrides", org.apache.thrift.protocol.TType.MAP, (short)4);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_OVERRIDES_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf_overrides", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("wait_secs", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_workers", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_executors", org.apache.storm.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_RESOURCES_OVERRIDES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_resources_overrides", org.apache.storm.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_CONF_OVERRIDES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_conf_overrides", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("principal", org.apache.storm.thrift.protocol.TType.STRING, (short)6);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RebalanceOptionsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RebalanceOptionsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new RebalanceOptionsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new RebalanceOptionsTupleSchemeFactory();
 
   private int wait_secs; // optional
   private int num_workers; // optional
@@ -46,7 +46,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
   private java.lang.String principal; // 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 {
     WAIT_SECS((short)1, "wait_secs"),
     NUM_WORKERS((short)2, "num_workers"),
     NUM_EXECUTORS((short)3, "num_executors"),
@@ -123,29 +123,29 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
   private static final int __NUM_WORKERS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.WAIT_SECS,_Fields.NUM_WORKERS,_Fields.NUM_EXECUTORS,_Fields.TOPOLOGY_RESOURCES_OVERRIDES,_Fields.TOPOLOGY_CONF_OVERRIDES,_Fields.PRINCIPAL};
-  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.WAIT_SECS, new org.apache.thrift.meta_data.FieldMetaData("wait_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
-    tmpMap.put(_Fields.TOPOLOGY_RESOURCES_OVERRIDES, new org.apache.thrift.meta_data.FieldMetaData("topology_resources_overrides", 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.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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))));
-    tmpMap.put(_Fields.TOPOLOGY_CONF_OVERRIDES, new org.apache.thrift.meta_data.FieldMetaData("topology_conf_overrides", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PRINCIPAL, new org.apache.thrift.meta_data.FieldMetaData("principal", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.WAIT_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("wait_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_workers", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_executors", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32))));
+    tmpMap.put(_Fields.TOPOLOGY_RESOURCES_OVERRIDES, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_resources_overrides", 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.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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)))));
+    tmpMap.put(_Fields.TOPOLOGY_CONF_OVERRIDES, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_conf_overrides", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PRINCIPAL, new org.apache.storm.thrift.meta_data.FieldMetaData("principal", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RebalanceOptions.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RebalanceOptions.class, metaDataMap);
   }
 
   public RebalanceOptions() {
@@ -211,16 +211,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
   }
 
   public void unset_wait_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
   }
 
   /** Returns true if field wait_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_wait_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
   }
 
   public void set_wait_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
   }
 
   public int get_num_workers() {
@@ -233,16 +233,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
   }
 
   public void unset_num_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   public void set_num_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
   }
 
   public int get_num_executors_size() {
@@ -575,7 +575,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       return lastComparison;
     }
     if (is_set_wait_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, other.wait_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.wait_secs, other.wait_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -585,7 +585,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       return lastComparison;
     }
     if (is_set_num_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -595,7 +595,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       return lastComparison;
     }
     if (is_set_num_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -605,7 +605,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       return lastComparison;
     }
     if (is_set_topology_resources_overrides()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_resources_overrides, other.topology_resources_overrides);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_resources_overrides, other.topology_resources_overrides);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -615,7 +615,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       return lastComparison;
     }
     if (is_set_topology_conf_overrides()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_conf_overrides, other.topology_conf_overrides);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_conf_overrides, other.topology_conf_overrides);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -625,7 +625,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       return lastComparison;
     }
     if (is_set_principal()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal, other.principal);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.principal, other.principal);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -637,11 +637,11 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
     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);
   }
 
@@ -705,15 +705,15 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -722,50 +722,50 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
     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 RebalanceOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class RebalanceOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public RebalanceOptionsStandardScheme getScheme() {
       return new RebalanceOptionsStandardScheme();
     }
   }
 
-  private static class RebalanceOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<RebalanceOptions> {
+  private static class RebalanceOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<RebalanceOptions> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, RebalanceOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, RebalanceOptions 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: // WAIT_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.wait_secs = iprot.readI32();
               struct.set_wait_secs_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: // NUM_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_workers = iprot.readI32();
               struct.set_num_workers_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: // NUM_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map566 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map566 = iprot.readMapBegin();
                 struct.num_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map566.size);
                 java.lang.String _key567;
                 int _val568;
@@ -779,13 +779,13 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
               }
               struct.set_num_executors_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: // TOPOLOGY_RESOURCES_OVERRIDES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map570 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map570 = iprot.readMapBegin();
                 struct.topology_resources_overrides = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(2*_map570.size);
                 java.lang.String _key571;
                 java.util.Map<java.lang.String,java.lang.Double> _val572;
@@ -793,7 +793,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
                 {
                   _key571 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map574 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map574 = iprot.readMapBegin();
                     _val572 = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map574.size);
                     java.lang.String _key575;
                     double _val576;
@@ -811,27 +811,27 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
               }
               struct.set_topology_resources_overrides_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: // TOPOLOGY_CONF_OVERRIDES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_conf_overrides = iprot.readString();
               struct.set_topology_conf_overrides_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: // PRINCIPAL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.principal = iprot.readString();
               struct.set_principal_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();
       }
@@ -839,7 +839,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, RebalanceOptions struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, RebalanceOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -857,7 +857,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
         if (struct.is_set_num_executors()) {
           oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.num_executors.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, struct.num_executors.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter578 : struct.num_executors.entrySet())
             {
               oprot.writeString(_iter578.getKey());
@@ -872,12 +872,12 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
         if (struct.is_set_topology_resources_overrides()) {
           oprot.writeFieldBegin(TOPOLOGY_RESOURCES_OVERRIDES_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.topology_resources_overrides.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.topology_resources_overrides.size()));
             for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Double>> _iter579 : struct.topology_resources_overrides.entrySet())
             {
               oprot.writeString(_iter579.getKey());
               {
-                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter579.getValue().size()));
+                oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, _iter579.getValue().size()));
                 for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter580 : _iter579.getValue().entrySet())
                 {
                   oprot.writeString(_iter580.getKey());
@@ -911,17 +911,17 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
 
   }
 
-  private static class RebalanceOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class RebalanceOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public RebalanceOptionsTupleScheme getScheme() {
       return new RebalanceOptionsTupleScheme();
     }
   }
 
-  private static class RebalanceOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<RebalanceOptions> {
+  private static class RebalanceOptionsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<RebalanceOptions> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions 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, RebalanceOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_wait_secs()) {
         optionals.set(0);
@@ -984,8 +984,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions 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, RebalanceOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.wait_secs = iprot.readI32();
@@ -997,7 +997,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map584 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map584 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, iprot.readI32());
           struct.num_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map584.size);
           java.lang.String _key585;
           int _val586;
@@ -1012,7 +1012,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TMap _map588 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map588 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
           struct.topology_resources_overrides = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(2*_map588.size);
           java.lang.String _key589;
           java.util.Map<java.lang.String,java.lang.Double> _val590;
@@ -1020,7 +1020,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
           {
             _key589 = iprot.readString();
             {
-              org.apache.thrift.protocol.TMap _map592 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+              org.apache.storm.thrift.protocol.TMap _map592 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
               _val590 = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map592.size);
               java.lang.String _key593;
               double _val594;
@@ -1047,8 +1047,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
     }
   }
 
-  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();
   }
 }
 


[07/50] [abbrv] storm git commit: STORM-2882: httpcore

Posted by bo...@apache.org.
STORM-2882: httpcore


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/60da0ef3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/60da0ef3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/60da0ef3

Branch: refs/heads/master
Commit: 60da0ef39a202eebd7fa68aeb4f1f9f9257b2ac1
Parents: 8fa2743
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 30 14:09:15 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 shaded-deps/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/60da0ef3/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 1fccb60..391d6fa 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -125,6 +125,10 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpclient</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/SpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SpoutSpec.java b/storm-client/src/jvm/org/apache/storm/generated/SpoutSpec.java
index e8a38c4..495ca4b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SpoutSpec.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SpoutSpec.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 SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec");
+public class SpoutSpec implements org.apache.storm.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SpoutSpec");
 
-  private static final org.apache.thrift.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("spout_object", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("common", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SpoutSpecStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SpoutSpecTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SpoutSpecStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SpoutSpecTupleSchemeFactory();
 
   private ComponentObject spout_object; // required
   private ComponentCommon common; // 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 {
     SPOUT_OBJECT((short)1, "spout_object"),
     COMMON((short)2, "common");
 
@@ -99,15 +99,15 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
   }
 
   // isset id assignments
-  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.SPOUT_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("spout_object", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentObject.class)));
-    tmpMap.put(_Fields.COMMON, new org.apache.thrift.meta_data.FieldMetaData("common", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentCommon.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.SPOUT_OBJECT, new org.apache.storm.thrift.meta_data.FieldMetaData("spout_object", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentObject.class)));
+    tmpMap.put(_Fields.COMMON, new org.apache.storm.thrift.meta_data.FieldMetaData("common", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentCommon.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutSpec.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutSpec.class, metaDataMap);
   }
 
   public SpoutSpec() {
@@ -302,7 +302,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
       return lastComparison;
     }
     if (is_set_spout_object()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spout_object, other.spout_object);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.spout_object, other.spout_object);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
       return lastComparison;
     }
     if (is_set_common()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.common, other.common);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
     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);
   }
 
@@ -356,14 +356,14 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
     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_spout_object()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'spout_object' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'spout_object' is unset! Struct:" + toString());
     }
 
     if (!is_set_common()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -374,58 +374,58 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
 
   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 SpoutSpecStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SpoutSpecStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SpoutSpecStandardScheme getScheme() {
       return new SpoutSpecStandardScheme();
     }
   }
 
-  private static class SpoutSpecStandardScheme extends org.apache.thrift.scheme.StandardScheme<SpoutSpec> {
+  private static class SpoutSpecStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SpoutSpec> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutSpec struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SpoutSpec 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: // SPOUT_OBJECT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.spout_object = new ComponentObject();
               struct.spout_object.read(iprot);
               struct.set_spout_object_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: // COMMON
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.common = new ComponentCommon();
               struct.common.read(iprot);
               struct.set_common_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();
       }
@@ -433,7 +433,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutSpec struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SpoutSpec struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -453,24 +453,24 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
 
   }
 
-  private static class SpoutSpecTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SpoutSpecTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SpoutSpecTupleScheme getScheme() {
       return new SpoutSpecTupleScheme();
     }
   }
 
-  private static class SpoutSpecTupleScheme extends org.apache.thrift.scheme.TupleScheme<SpoutSpec> {
+  private static class SpoutSpecTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SpoutSpec> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SpoutSpec 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, SpoutSpec struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.spout_object.write(oprot);
       struct.common.write(oprot);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SpoutSpec 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, SpoutSpec struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.spout_object = new ComponentObject();
       struct.spout_object.read(iprot);
       struct.set_spout_object_isSet(true);
@@ -480,8 +480,8 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
     }
   }
 
-  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/SpoutStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SpoutStats.java b/storm-client/src/jvm/org/apache/storm/generated/SpoutStats.java
index 694def3..fa6236d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SpoutStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SpoutStats.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 SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats");
+public class SpoutStats implements org.apache.storm.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SpoutStats");
 
-  private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
-  private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField COMPLETE_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("complete_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("acked", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("failed", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField COMPLETE_MS_AVG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("complete_ms_avg", org.apache.storm.thrift.protocol.TType.MAP, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SpoutStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SpoutStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SpoutStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SpoutStatsTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>> acked; // required
   private java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>> failed; // required
   private java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>> complete_ms_avg; // 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 {
     ACKED((short)1, "acked"),
     FAILED((short)2, "failed"),
     COMPLETE_MS_AVG((short)3, "complete_ms_avg");
@@ -104,29 +104,29 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
   }
 
   // isset id assignments
-  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.ACKED, new org.apache.thrift.meta_data.FieldMetaData("acked", 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.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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.FAILED, new org.apache.thrift.meta_data.FieldMetaData("failed", 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.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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.COMPLETE_MS_AVG, new org.apache.thrift.meta_data.FieldMetaData("complete_ms_avg", 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.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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))));
+    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.ACKED, new org.apache.storm.thrift.meta_data.FieldMetaData("acked", 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.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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.FAILED, new org.apache.storm.thrift.meta_data.FieldMetaData("failed", 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.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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.COMPLETE_MS_AVG, new org.apache.storm.thrift.meta_data.FieldMetaData("complete_ms_avg", 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.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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutStats.class, metaDataMap);
   }
 
   public SpoutStats() {
@@ -445,7 +445,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       return lastComparison;
     }
     if (is_set_acked()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, other.acked);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.acked, other.acked);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -455,7 +455,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       return lastComparison;
     }
     if (is_set_failed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, other.failed);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.failed, other.failed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -465,7 +465,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       return lastComparison;
     }
     if (is_set_complete_ms_avg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.complete_ms_avg, other.complete_ms_avg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.complete_ms_avg, other.complete_ms_avg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -477,11 +477,11 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
     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);
   }
 
@@ -517,18 +517,18 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
     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_acked()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString());
     }
 
     if (!is_set_failed()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString());
     }
 
     if (!is_set_complete_ms_avg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'complete_ms_avg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'complete_ms_avg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -536,42 +536,42 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
 
   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 SpoutStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SpoutStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SpoutStatsStandardScheme getScheme() {
       return new SpoutStatsStandardScheme();
     }
   }
 
-  private static class SpoutStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SpoutStats> {
+  private static class SpoutStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SpoutStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SpoutStats 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: // ACKED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map260 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map260 = iprot.readMapBegin();
                 struct.acked = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map260.size);
                 java.lang.String _key261;
                 java.util.Map<java.lang.String,java.lang.Long> _val262;
@@ -579,7 +579,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
                 {
                   _key261 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map264 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map264 = iprot.readMapBegin();
                     _val262 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map264.size);
                     java.lang.String _key265;
                     long _val266;
@@ -597,13 +597,13 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
               }
               struct.set_acked_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: // FAILED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map268 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map268 = iprot.readMapBegin();
                 struct.failed = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map268.size);
                 java.lang.String _key269;
                 java.util.Map<java.lang.String,java.lang.Long> _val270;
@@ -611,7 +611,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
                 {
                   _key269 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map272 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map272 = iprot.readMapBegin();
                     _val270 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map272.size);
                     java.lang.String _key273;
                     long _val274;
@@ -629,13 +629,13 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
               }
               struct.set_failed_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: // COMPLETE_MS_AVG
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map276 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map276 = iprot.readMapBegin();
                 struct.complete_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(2*_map276.size);
                 java.lang.String _key277;
                 java.util.Map<java.lang.String,java.lang.Double> _val278;
@@ -643,7 +643,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
                 {
                   _key277 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map280 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map280 = iprot.readMapBegin();
                     _val278 = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map280.size);
                     java.lang.String _key281;
                     double _val282;
@@ -661,11 +661,11 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
               }
               struct.set_complete_ms_avg_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();
       }
@@ -673,19 +673,19 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SpoutStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.acked != null) {
         oprot.writeFieldBegin(ACKED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.acked.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Long>> _iter284 : struct.acked.entrySet())
           {
             oprot.writeString(_iter284.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter284.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, _iter284.getValue().size()));
               for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter285 : _iter284.getValue().entrySet())
               {
                 oprot.writeString(_iter285.getKey());
@@ -701,12 +701,12 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       if (struct.failed != null) {
         oprot.writeFieldBegin(FAILED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.failed.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Long>> _iter286 : struct.failed.entrySet())
           {
             oprot.writeString(_iter286.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter286.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, _iter286.getValue().size()));
               for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter287 : _iter286.getValue().entrySet())
               {
                 oprot.writeString(_iter287.getKey());
@@ -722,12 +722,12 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       if (struct.complete_ms_avg != null) {
         oprot.writeFieldBegin(COMPLETE_MS_AVG_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.complete_ms_avg.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.complete_ms_avg.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Double>> _iter288 : struct.complete_ms_avg.entrySet())
           {
             oprot.writeString(_iter288.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter288.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, _iter288.getValue().size()));
               for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter289 : _iter288.getValue().entrySet())
               {
                 oprot.writeString(_iter289.getKey());
@@ -746,17 +746,17 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
 
   }
 
-  private static class SpoutStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SpoutStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SpoutStatsTupleScheme getScheme() {
       return new SpoutStatsTupleScheme();
     }
   }
 
-  private static class SpoutStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<SpoutStats> {
+  private static class SpoutStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SpoutStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SpoutStats 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, SpoutStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.acked.size());
         for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Long>> _iter290 : struct.acked.entrySet())
@@ -805,10 +805,10 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SpoutStats 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, SpoutStats 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 _map296 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map296 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.acked = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map296.size);
         java.lang.String _key297;
         java.util.Map<java.lang.String,java.lang.Long> _val298;
@@ -816,7 +816,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
         {
           _key297 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map300 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map300 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val298 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map300.size);
             java.lang.String _key301;
             long _val302;
@@ -832,7 +832,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       }
       struct.set_acked_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map304 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map304 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.failed = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map304.size);
         java.lang.String _key305;
         java.util.Map<java.lang.String,java.lang.Long> _val306;
@@ -840,7 +840,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
         {
           _key305 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map308 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map308 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val306 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map308.size);
             java.lang.String _key309;
             long _val310;
@@ -856,7 +856,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
       }
       struct.set_failed_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map312 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map312 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.complete_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Double>>(2*_map312.size);
         java.lang.String _key313;
         java.util.Map<java.lang.String,java.lang.Double> _val314;
@@ -864,7 +864,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
         {
           _key313 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map316 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map316 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
             _val314 = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map316.size);
             java.lang.String _key317;
             double _val318;
@@ -882,8 +882,8 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
     }
   }
 
-  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/StateSpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StateSpoutSpec.java b/storm-client/src/jvm/org/apache/storm/generated/StateSpoutSpec.java
index 7658b90..5d0b2f8 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StateSpoutSpec.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StateSpoutSpec.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 StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec");
+public class StateSpoutSpec implements org.apache.storm.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("StateSpoutSpec");
 
-  private static final org.apache.thrift.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("state_spout_object", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("common", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StateSpoutSpecStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StateSpoutSpecTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StateSpoutSpecStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StateSpoutSpecTupleSchemeFactory();
 
   private ComponentObject state_spout_object; // required
   private ComponentCommon common; // 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 {
     STATE_SPOUT_OBJECT((short)1, "state_spout_object"),
     COMMON((short)2, "common");
 
@@ -99,15 +99,15 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
   }
 
   // isset id assignments
-  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.STATE_SPOUT_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("state_spout_object", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentObject.class)));
-    tmpMap.put(_Fields.COMMON, new org.apache.thrift.meta_data.FieldMetaData("common", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentCommon.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.STATE_SPOUT_OBJECT, new org.apache.storm.thrift.meta_data.FieldMetaData("state_spout_object", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentObject.class)));
+    tmpMap.put(_Fields.COMMON, new org.apache.storm.thrift.meta_data.FieldMetaData("common", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentCommon.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StateSpoutSpec.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StateSpoutSpec.class, metaDataMap);
   }
 
   public StateSpoutSpec() {
@@ -302,7 +302,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
       return lastComparison;
     }
     if (is_set_state_spout_object()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spout_object, other.state_spout_object);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.state_spout_object, other.state_spout_object);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
       return lastComparison;
     }
     if (is_set_common()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.common, other.common);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
     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);
   }
 
@@ -356,14 +356,14 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
     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_state_spout_object()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spout_object' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'state_spout_object' is unset! Struct:" + toString());
     }
 
     if (!is_set_common()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -374,58 +374,58 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
 
   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 StateSpoutSpecStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StateSpoutSpecStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StateSpoutSpecStandardScheme getScheme() {
       return new StateSpoutSpecStandardScheme();
     }
   }
 
-  private static class StateSpoutSpecStandardScheme extends org.apache.thrift.scheme.StandardScheme<StateSpoutSpec> {
+  private static class StateSpoutSpecStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<StateSpoutSpec> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, StateSpoutSpec struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, StateSpoutSpec 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: // STATE_SPOUT_OBJECT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.state_spout_object = new ComponentObject();
               struct.state_spout_object.read(iprot);
               struct.set_state_spout_object_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: // COMMON
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.common = new ComponentCommon();
               struct.common.read(iprot);
               struct.set_common_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();
       }
@@ -433,7 +433,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, StateSpoutSpec struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, StateSpoutSpec struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -453,24 +453,24 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
 
   }
 
-  private static class StateSpoutSpecTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StateSpoutSpecTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StateSpoutSpecTupleScheme getScheme() {
       return new StateSpoutSpecTupleScheme();
     }
   }
 
-  private static class StateSpoutSpecTupleScheme extends org.apache.thrift.scheme.TupleScheme<StateSpoutSpec> {
+  private static class StateSpoutSpecTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<StateSpoutSpec> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec 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, StateSpoutSpec struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.state_spout_object.write(oprot);
       struct.common.write(oprot);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec 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, StateSpoutSpec struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.state_spout_object = new ComponentObject();
       struct.state_spout_object.read(iprot);
       struct.set_state_spout_object_isSet(true);
@@ -480,8 +480,8 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
     }
   }
 
-  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();
   }
 }
 


[06/50] [abbrv] storm git commit: STORM-2882: Fixed some issues with tests with guava conflicts

Posted by bo...@apache.org.
STORM-2882: Fixed some issues with tests with guava conflicts


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/719221c9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/719221c9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/719221c9

Branch: refs/heads/master
Commit: 719221c9f17204074859506d98d2711e18d120af
Parents: 2837eea
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri May 25 16:56:52 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:12 2018 -0500

----------------------------------------------------------------------
 .../java/org/apache/storm/blobstore/FileBlobStoreImpl.java     | 2 +-
 .../main/java/org/apache/storm/blobstore/LocalFsBlobStore.java | 2 +-
 .../src/main/java/org/apache/storm/daemon/drpc/DRPC.java       | 2 +-
 .../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java   | 6 +++---
 .../org/apache/storm/daemon/supervisor/BasicContainer.java     | 4 ++--
 .../src/main/java/org/apache/storm/daemon/supervisor/Slot.java | 2 +-
 .../java/org/apache/storm/daemon/supervisor/Supervisor.java    | 2 +-
 .../main/java/org/apache/storm/localizer/AsyncLocalizer.java   | 4 ++--
 .../java/org/apache/storm/localizer/LocalizedResource.java     | 2 +-
 .../apache/storm/localizer/LocalizedResourceRetentionSet.java  | 3 +--
 .../java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java  | 2 +-
 .../java/org/apache/storm/nimbus/LeaderListenerCallback.java   | 4 ++--
 .../storm/nimbus/WorkerHeartbeatsRecoveryStrategyFactory.java  | 2 +-
 .../src/main/java/org/apache/storm/scheduler/Cluster.java      | 2 +-
 .../main/java/org/apache/storm/scheduler/EvenScheduler.java    | 4 ++--
 .../apache/storm/scheduler/blacklist/BlacklistScheduler.java   | 4 ++--
 .../storm/scheduler/resource/ResourceAwareScheduler.java       | 2 +-
 .../scheduler/resource/normalization/NormalizedResources.java  | 2 +-
 .../strategies/scheduling/BaseResourceAwareStrategy.java       | 4 ++--
 .../strategies/scheduling/ConstraintSolverStrategy.java        | 2 +-
 20 files changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/blobstore/FileBlobStoreImpl.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/FileBlobStoreImpl.java b/storm-server/src/main/java/org/apache/storm/blobstore/FileBlobStoreImpl.java
index 782a5bf..4552981 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/FileBlobStoreImpl.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/FileBlobStoreImpl.java
@@ -12,7 +12,6 @@
 
 package org.apache.storm.blobstore;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -30,6 +29,7 @@ import java.util.NoSuchElementException;
 import java.util.Timer;
 import java.util.TimerTask;
 import org.apache.storm.Config;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.ObjectReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
index 423a7a3..a72944b 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
@@ -14,7 +14,6 @@
 
 package org.apache.storm.blobstore;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -41,6 +40,7 @@ import org.apache.storm.generated.ReadableBlobMeta;
 import org.apache.storm.generated.SettableBlobMeta;
 import org.apache.storm.nimbus.ILeaderElector;
 import org.apache.storm.nimbus.NimbusInfo;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
 import org.apache.storm.utils.ConfigUtils;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java b/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
index 9c12209..4a91e32 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
@@ -19,7 +19,6 @@
 package org.apache.storm.daemon.drpc;
 
 import com.codahale.metrics.Meter;
-import com.google.common.annotations.VisibleForTesting;
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.Map;
@@ -40,6 +39,7 @@ import org.apache.storm.metric.StormMetricsRegistry;
 import org.apache.storm.security.auth.IAuthorizer;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.authorizer.DRPCAuthorizerBase;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.WrappedAuthorizationException;
 import org.apache.storm.utils.WrappedDRPCExecutionException;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index 4a33d77..d53cc28 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -21,9 +21,6 @@ package org.apache.storm.daemon.nimbus;
 import com.codahale.metrics.ExponentiallyDecayingReservoir;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -180,6 +177,9 @@ import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.security.auth.ThriftServer;
 import org.apache.storm.security.auth.workertoken.WorkerTokenManager;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
+import org.apache.storm.shade.com.google.common.base.Strings;
+import org.apache.storm.shade.com.google.common.collect.ImmutableMap;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
 import org.apache.storm.shade.org.apache.zookeeper.data.ACL;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
index 2358f2a..5fccf7a 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
@@ -18,8 +18,6 @@
 
 package org.apache.storm.daemon.supervisor;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
@@ -43,6 +41,8 @@ import org.apache.storm.generated.ProfileAction;
 import org.apache.storm.generated.ProfileRequest;
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.generated.WorkerResources;
+import org.apache.storm.shade.com.google.common.base.Joiner;
+import org.apache.storm.shade.com.google.common.collect.Lists;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.LocalState;
 import org.apache.storm.utils.ObjectReader;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
index 1dda41c..c5b8efd 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
@@ -13,7 +13,6 @@
 package org.apache.storm.daemon.supervisor;
 
 import com.codahale.metrics.Meter;
-import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -45,6 +44,7 @@ import org.apache.storm.localizer.LocallyCachedBlob;
 import org.apache.storm.metric.StormMetricsRegistry;
 import org.apache.storm.metricstore.WorkerMetricsProcessor;
 import org.apache.storm.scheduler.ISupervisor;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.LocalState;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.Time;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
index d5ac413..3f13864 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
@@ -18,7 +18,6 @@
 
 package org.apache.storm.daemon.supervisor;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.io.IOException;
 import java.net.BindException;
@@ -64,6 +63,7 @@ import org.apache.storm.security.auth.IAuthorizer;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.security.auth.ThriftServer;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.LocalState;
 import org.apache.storm.utils.ObjectReader;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
index db8c58e..98ad02e 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
@@ -18,8 +18,6 @@
 
 package org.apache.storm.localizer;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -51,6 +49,8 @@ import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.KeyNotFoundException;
 import org.apache.storm.generated.LocalAssignment;
 import org.apache.storm.generated.StormTopology;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
+import org.apache.storm.shade.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.NimbusLeaderNotFoundException;
 import org.apache.storm.utils.ObjectReader;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java
index 927b999..b19b116 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java
@@ -18,7 +18,6 @@
 
 package org.apache.storm.localizer;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileOutputStream;
@@ -49,6 +48,7 @@ import org.apache.storm.daemon.supervisor.IAdvancedFSOps;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.KeyNotFoundException;
 import org.apache.storm.generated.ReadableBlobMeta;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ServerUtils;
 import org.apache.storm.utils.ShellUtils;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
index fe5246e..372334b 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
@@ -12,7 +12,6 @@
 
 package org.apache.storm.localizer;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Map;
@@ -21,7 +20,7 @@ import java.util.TreeMap;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.storm.blobstore.ClientBlobStore;
 import org.apache.storm.generated.AuthorizationException;
-import org.apache.storm.generated.KeyNotFoundException;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java
index fffcaf1..7065d3b 100644
--- a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java
+++ b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java
@@ -11,7 +11,6 @@
 
 package org.apache.storm.metricstore.rocksdb;
 
-import com.google.common.primitives.UnsignedBytes;
 import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -19,6 +18,7 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.xml.bind.DatatypeConverter;
 import org.apache.storm.metricstore.AggLevel;
+import org.apache.storm.shade.com.google.common.primitives.UnsignedBytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java b/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
index 590cb13..e54509e 100644
--- a/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
+++ b/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
@@ -12,8 +12,6 @@
 
 package org.apache.storm.nimbus;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Sets;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
@@ -32,6 +30,8 @@ import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.KeyNotFoundException;
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.security.auth.ReqContext;
+import org.apache.storm.shade.com.google.common.base.Joiner;
+import org.apache.storm.shade.com.google.common.collect.Sets;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.LeaderLatch;
 import org.apache.storm.shade.org.apache.zookeeper.CreateMode;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/nimbus/WorkerHeartbeatsRecoveryStrategyFactory.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/WorkerHeartbeatsRecoveryStrategyFactory.java b/storm-server/src/main/java/org/apache/storm/nimbus/WorkerHeartbeatsRecoveryStrategyFactory.java
index f656089..b2dc777 100644
--- a/storm-server/src/main/java/org/apache/storm/nimbus/WorkerHeartbeatsRecoveryStrategyFactory.java
+++ b/storm-server/src/main/java/org/apache/storm/nimbus/WorkerHeartbeatsRecoveryStrategyFactory.java
@@ -12,9 +12,9 @@
 
 package org.apache.storm.nimbus;
 
-import com.google.common.base.Preconditions;
 import java.util.Map;
 import org.apache.storm.DaemonConfig;
+import org.apache.storm.shade.com.google.common.base.Preconditions;
 import org.apache.storm.utils.ReflectionUtils;
 
 /**

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java b/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java
index ab95bd2..3f48669 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java
@@ -18,7 +18,6 @@
 
 package org.apache.storm.scheduler;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -40,6 +39,7 @@ import org.apache.storm.networktopography.DefaultRackDNSToSwitchMapping;
 import org.apache.storm.scheduler.resource.normalization.NormalizedResourceOffer;
 import org.apache.storm.scheduler.resource.normalization.NormalizedResourceRequest;
 import org.apache.storm.scheduler.resource.normalization.NormalizedResources;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ReflectionUtils;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java
index f4ac258..e6b9e20 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java
@@ -18,8 +18,6 @@
 
 package org.apache.storm.scheduler;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -29,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
+import org.apache.storm.shade.com.google.common.collect.Sets;
 import org.apache.storm.utils.ServerUtils;
 import org.apache.storm.utils.Utils;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java
index d65c125..9f1a123 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java
@@ -12,8 +12,6 @@
 
 package org.apache.storm.scheduler.blacklist;
 
-import com.google.common.collect.EvictingQueue;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -31,6 +29,8 @@ import org.apache.storm.scheduler.blacklist.reporters.IReporter;
 import org.apache.storm.scheduler.blacklist.reporters.LogReporter;
 import org.apache.storm.scheduler.blacklist.strategies.DefaultBlacklistStrategy;
 import org.apache.storm.scheduler.blacklist.strategies.IBlacklistStrategy;
+import org.apache.storm.shade.com.google.common.collect.EvictingQueue;
+import org.apache.storm.shade.com.google.common.collect.Sets;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ReflectionUtils;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java
index 60f6f6c..3ee693a 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java
@@ -12,7 +12,6 @@
 
 package org.apache.storm.scheduler.resource;
 
-import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -32,6 +31,7 @@ import org.apache.storm.scheduler.resource.strategies.priority.ISchedulingPriori
 import org.apache.storm.scheduler.resource.strategies.scheduling.IStrategy;
 import org.apache.storm.scheduler.utils.ConfigLoaderFactoryService;
 import org.apache.storm.scheduler.utils.IConfigLoader;
+import org.apache.storm.shade.com.google.common.collect.ImmutableList;
 import org.apache.storm.utils.DisallowedStrategyException;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ReflectionUtils;

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResources.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResources.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResources.java
index d6bf96e..4a06999 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResources.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResources.java
@@ -19,12 +19,12 @@
 package org.apache.storm.scheduler.resource.normalization;
 
 import com.codahale.metrics.Meter;
-import com.google.common.annotations.VisibleForTesting;
 import java.util.Arrays;
 import java.util.Map;
 import org.apache.storm.Constants;
 import org.apache.storm.generated.WorkerResources;
 import org.apache.storm.metric.StormMetricsRegistry;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
index 7e50f4a..7d22336 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
@@ -18,8 +18,6 @@
 
 package org.apache.storm.scheduler.resource.strategies.scheduling;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -47,6 +45,8 @@ import org.apache.storm.scheduler.resource.SchedulingResult;
 import org.apache.storm.scheduler.resource.SchedulingStatus;
 import org.apache.storm.scheduler.resource.normalization.NormalizedResourceOffer;
 import org.apache.storm.scheduler.resource.normalization.NormalizedResourceRequest;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
+import org.apache.storm.shade.com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/719221c9/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverStrategy.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverStrategy.java
index bf52756..9c56773 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverStrategy.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverStrategy.java
@@ -12,7 +12,6 @@
 
 package org.apache.storm.scheduler.resource.strategies.scheduling;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -35,6 +34,7 @@ import org.apache.storm.scheduler.resource.RAS_Node;
 import org.apache.storm.scheduler.resource.RAS_Nodes;
 import org.apache.storm.scheduler.resource.SchedulingResult;
 import org.apache.storm.scheduler.resource.SchedulingStatus;
+import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.Time;
 import org.slf4j.Logger;


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
index d0111ec..f997ac3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorAssignments.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class SupervisorAssignments implements org.apache.thrift.TBase<SupervisorAssignments, SupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorAssignments> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorAssignments");
+public class SupervisorAssignments implements org.apache.storm.thrift.TBase<SupervisorAssignments, SupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorAssignments> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SupervisorAssignments");
 
-  private static final org.apache.thrift.protocol.TField STORM_ASSIGNMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("storm_assignment", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField STORM_ASSIGNMENT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("storm_assignment", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorAssignmentsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorAssignmentsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorAssignmentsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorAssignmentsTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,Assignment> storm_assignment; // 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 {
     STORM_ASSIGNMENT((short)1, "storm_assignment");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -95,15 +95,15 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.STORM_ASSIGNMENT};
-  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.STORM_ASSIGNMENT, new org.apache.thrift.meta_data.FieldMetaData("storm_assignment", 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, Assignment.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.STORM_ASSIGNMENT, new org.apache.storm.thrift.meta_data.FieldMetaData("storm_assignment", 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, Assignment.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorAssignments.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorAssignments.class, metaDataMap);
   }
 
   public SupervisorAssignments() {
@@ -262,7 +262,7 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
       return lastComparison;
     }
     if (is_set_storm_assignment()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storm_assignment, other.storm_assignment);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.storm_assignment, other.storm_assignment);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -274,11 +274,11 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
     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);
   }
 
@@ -300,49 +300,49 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 SupervisorAssignmentsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorAssignmentsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorAssignmentsStandardScheme getScheme() {
       return new SupervisorAssignmentsStandardScheme();
     }
   }
 
-  private static class SupervisorAssignmentsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorAssignments> {
+  private static class SupervisorAssignmentsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SupervisorAssignments> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorAssignments struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SupervisorAssignments 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: // STORM_ASSIGNMENT
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map886 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map886 = iprot.readMapBegin();
                 struct.storm_assignment = new java.util.HashMap<java.lang.String,Assignment>(2*_map886.size);
                 java.lang.String _key887;
                 Assignment _val888;
@@ -357,11 +357,11 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
               }
               struct.set_storm_assignment_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();
       }
@@ -369,7 +369,7 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorAssignments struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SupervisorAssignments struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -377,7 +377,7 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
         if (struct.is_set_storm_assignment()) {
           oprot.writeFieldBegin(STORM_ASSIGNMENT_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.storm_assignment.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.storm_assignment.size()));
             for (java.util.Map.Entry<java.lang.String, Assignment> _iter890 : struct.storm_assignment.entrySet())
             {
               oprot.writeString(_iter890.getKey());
@@ -394,17 +394,17 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
 
   }
 
-  private static class SupervisorAssignmentsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorAssignmentsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorAssignmentsTupleScheme getScheme() {
       return new SupervisorAssignmentsTupleScheme();
     }
   }
 
-  private static class SupervisorAssignmentsTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorAssignments> {
+  private static class SupervisorAssignmentsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SupervisorAssignments> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorAssignments 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, SupervisorAssignments struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_storm_assignment()) {
         optionals.set(0);
@@ -423,12 +423,12 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorAssignments 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, SupervisorAssignments struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map892 = 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 _map892 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.storm_assignment = new java.util.HashMap<java.lang.String,Assignment>(2*_map892.size);
           java.lang.String _key893;
           Assignment _val894;
@@ -445,8 +445,8 @@ public class SupervisorAssignments implements org.apache.thrift.TBase<Supervisor
     }
   }
 
-  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/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
index 3312601..7d4cc6e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.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 SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, SupervisorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorInfo");
-
-  private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I64, (short)1);
-  private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostname", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField ASSIGNMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("assignment_id", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField USED_PORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("used_ports", org.apache.thrift.protocol.TType.LIST, (short)4);
-  private static final org.apache.thrift.protocol.TField META_FIELD_DESC = new org.apache.thrift.protocol.TField("meta", org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField SCHEDULER_META_FIELD_DESC = new org.apache.thrift.protocol.TField("scheduler_meta", org.apache.thrift.protocol.TType.MAP, (short)6);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I64, (short)7);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("resources_map", org.apache.thrift.protocol.TType.MAP, (short)9);
-  private static final org.apache.thrift.protocol.TField SERVER_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("server_port", org.apache.thrift.protocol.TType.I32, (short)10);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorInfoTupleSchemeFactory();
+public class SupervisorInfo implements org.apache.storm.thrift.TBase<SupervisorInfo, SupervisorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SupervisorInfo");
+
+  private static final org.apache.storm.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_secs", org.apache.storm.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("hostname", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNMENT_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assignment_id", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField USED_PORTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("used_ports", org.apache.storm.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField META_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("meta", org.apache.storm.thrift.protocol.TType.LIST, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField SCHEDULER_META_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("scheduler_meta", org.apache.storm.thrift.protocol.TType.MAP, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I64, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("version", org.apache.storm.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("resources_map", org.apache.storm.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField SERVER_PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("server_port", org.apache.storm.thrift.protocol.TType.I32, (short)10);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorInfoTupleSchemeFactory();
 
   private long time_secs; // required
   private java.lang.String hostname; // required
@@ -54,7 +54,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
   private int server_port; // 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 {
     TIME_SECS((short)1, "time_secs"),
     HOSTNAME((short)2, "hostname"),
     ASSIGNMENT_ID((short)3, "assignment_id"),
@@ -144,37 +144,37 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
   private static final int __SERVER_PORT_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.ASSIGNMENT_ID,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS,_Fields.VERSION,_Fields.RESOURCES_MAP,_Fields.SERVER_PORT};
-  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.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.HOSTNAME, new org.apache.thrift.meta_data.FieldMetaData("hostname", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ASSIGNMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("assignment_id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.USED_PORTS, new org.apache.thrift.meta_data.FieldMetaData("used_ports", 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.I64))));
-    tmpMap.put(_Fields.META, new org.apache.thrift.meta_data.FieldMetaData("meta", 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.I64))));
-    tmpMap.put(_Fields.SCHEDULER_META, new org.apache.thrift.meta_data.FieldMetaData("scheduler_meta", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCES_MAP, new org.apache.thrift.meta_data.FieldMetaData("resources_map", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
-    tmpMap.put(_Fields.SERVER_PORT, new org.apache.thrift.meta_data.FieldMetaData("server_port", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("time_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.HOSTNAME, new org.apache.storm.thrift.meta_data.FieldMetaData("hostname", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ASSIGNMENT_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("assignment_id", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.USED_PORTS, new org.apache.storm.thrift.meta_data.FieldMetaData("used_ports", 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.I64))));
+    tmpMap.put(_Fields.META, new org.apache.storm.thrift.meta_data.FieldMetaData("meta", 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.I64))));
+    tmpMap.put(_Fields.SCHEDULER_META, new org.apache.storm.thrift.meta_data.FieldMetaData("scheduler_meta", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("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.RESOURCES_MAP, new org.apache.storm.thrift.meta_data.FieldMetaData("resources_map", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
+    tmpMap.put(_Fields.SERVER_PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("server_port", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorInfo.class, metaDataMap);
   }
 
   public SupervisorInfo() {
@@ -256,16 +256,16 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
   }
 
   public void unset_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   public void set_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_hostname() {
@@ -434,16 +434,16 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_version() {
@@ -513,16 +513,16 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
   }
 
   public void unset_server_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVER_PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVER_PORT_ISSET_ID);
   }
 
   /** Returns true if field server_port is set (has been assigned a value) and false otherwise */
   public boolean is_set_server_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVER_PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVER_PORT_ISSET_ID);
   }
 
   public void set_server_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVER_PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVER_PORT_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -789,7 +789,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
   public int hashCode() {
     int hashCode = 1;
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(time_secs);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(time_secs);
 
     hashCode = hashCode * 8191 + ((is_set_hostname()) ? 131071 : 524287);
     if (is_set_hostname())
@@ -813,7 +813,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
 
     hashCode = hashCode * 8191 + ((is_set_uptime_secs()) ? 131071 : 524287);
     if (is_set_uptime_secs())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(uptime_secs);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(uptime_secs);
 
     hashCode = hashCode * 8191 + ((is_set_version()) ? 131071 : 524287);
     if (is_set_version())
@@ -843,7 +843,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -853,7 +853,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_hostname()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostname, other.hostname);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.hostname, other.hostname);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -863,7 +863,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_assignment_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assignment_id, other.assignment_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assignment_id, other.assignment_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -873,7 +873,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_used_ports()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.used_ports, other.used_ports);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.used_ports, other.used_ports);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -883,7 +883,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_meta()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.meta, other.meta);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.meta, other.meta);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -893,7 +893,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_scheduler_meta()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scheduler_meta, other.scheduler_meta);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.scheduler_meta, other.scheduler_meta);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -903,7 +903,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -913,7 +913,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.version, other.version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -923,7 +923,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_resources_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resources_map, other.resources_map);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.resources_map, other.resources_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -933,7 +933,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       return lastComparison;
     }
     if (is_set_server_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server_port, other.server_port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.server_port, other.server_port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -945,11 +945,11 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
     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);
   }
 
@@ -1045,14 +1045,14 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
     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_time_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_hostname()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'hostname' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'hostname' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1060,8 +1060,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
 
   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);
     }
   }
@@ -1070,58 +1070,58 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
     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 SupervisorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorInfoStandardScheme getScheme() {
       return new SupervisorInfoStandardScheme();
     }
   }
 
-  private static class SupervisorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorInfo> {
+  private static class SupervisorInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SupervisorInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SupervisorInfo 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: // TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.time_secs = iprot.readI64();
               struct.set_time_secs_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: // HOSTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.hostname = iprot.readString();
               struct.set_hostname_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: // ASSIGNMENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.assignment_id = iprot.readString();
               struct.set_assignment_id_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: // USED_PORTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list622 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list622 = iprot.readListBegin();
                 struct.used_ports = new java.util.ArrayList<java.lang.Long>(_list622.size);
                 long _elem623;
                 for (int _i624 = 0; _i624 < _list622.size; ++_i624)
@@ -1133,13 +1133,13 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
               }
               struct.set_used_ports_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: // META
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list625 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list625 = iprot.readListBegin();
                 struct.meta = new java.util.ArrayList<java.lang.Long>(_list625.size);
                 long _elem626;
                 for (int _i627 = 0; _i627 < _list625.size; ++_i627)
@@ -1151,13 +1151,13 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
               }
               struct.set_meta_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: // SCHEDULER_META
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map628 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map628 = iprot.readMapBegin();
                 struct.scheduler_meta = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map628.size);
                 java.lang.String _key629;
                 java.lang.String _val630;
@@ -1171,29 +1171,29 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
               }
               struct.set_scheduler_meta_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.uptime_secs = iprot.readI64();
               struct.set_uptime_secs_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: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.version = iprot.readString();
               struct.set_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: // RESOURCES_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map632 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map632 = iprot.readMapBegin();
                 struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map632.size);
                 java.lang.String _key633;
                 double _val634;
@@ -1207,19 +1207,19 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
               }
               struct.set_resources_map_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: // SERVER_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.server_port = iprot.readI32();
               struct.set_server_port_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();
       }
@@ -1227,7 +1227,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SupervisorInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1250,7 +1250,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
         if (struct.is_set_used_ports()) {
           oprot.writeFieldBegin(USED_PORTS_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.used_ports.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, struct.used_ports.size()));
             for (long _iter636 : struct.used_ports)
             {
               oprot.writeI64(_iter636);
@@ -1264,7 +1264,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
         if (struct.is_set_meta()) {
           oprot.writeFieldBegin(META_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.meta.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, struct.meta.size()));
             for (long _iter637 : struct.meta)
             {
               oprot.writeI64(_iter637);
@@ -1278,7 +1278,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
         if (struct.is_set_scheduler_meta()) {
           oprot.writeFieldBegin(SCHEDULER_META_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.scheduler_meta.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, struct.scheduler_meta.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter638 : struct.scheduler_meta.entrySet())
             {
               oprot.writeString(_iter638.getKey());
@@ -1305,7 +1305,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
         if (struct.is_set_resources_map()) {
           oprot.writeFieldBegin(RESOURCES_MAP_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter639 : struct.resources_map.entrySet())
             {
               oprot.writeString(_iter639.getKey());
@@ -1327,17 +1327,17 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
 
   }
 
-  private static class SupervisorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorInfoTupleScheme getScheme() {
       return new SupervisorInfoTupleScheme();
     }
   }
 
-  private static class SupervisorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorInfo> {
+  private static class SupervisorInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SupervisorInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo 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, SupervisorInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI64(struct.time_secs);
       oprot.writeString(struct.hostname);
       java.util.BitSet optionals = new java.util.BitSet();
@@ -1419,8 +1419,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo 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, SupervisorInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.time_secs = iprot.readI64();
       struct.set_time_secs_isSet(true);
       struct.hostname = iprot.readString();
@@ -1432,7 +1432,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list644 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list644 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.used_ports = new java.util.ArrayList<java.lang.Long>(_list644.size);
           long _elem645;
           for (int _i646 = 0; _i646 < _list644.size; ++_i646)
@@ -1445,7 +1445,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list647 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list647 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.meta = new java.util.ArrayList<java.lang.Long>(_list647.size);
           long _elem648;
           for (int _i649 = 0; _i649 < _list647.size; ++_i649)
@@ -1458,7 +1458,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TMap _map650 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map650 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.scheduler_meta = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map650.size);
           java.lang.String _key651;
           java.lang.String _val652;
@@ -1481,7 +1481,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TMap _map654 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map654 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map654.size);
           java.lang.String _key655;
           double _val656;
@@ -1501,8 +1501,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
     }
   }
 
-  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/SupervisorPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
index 8d0c5e0..4ac3d53 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.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 SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPageInfo, SupervisorPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorPageInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorPageInfo");
+public class SupervisorPageInfo implements org.apache.storm.thrift.TBase<SupervisorPageInfo, SupervisorPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorPageInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SupervisorPageInfo");
 
-  private static final org.apache.thrift.protocol.TField SUPERVISOR_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_summaries", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField WORKER_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("worker_summaries", org.apache.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SUPERVISOR_SUMMARIES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("supervisor_summaries", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField WORKER_SUMMARIES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("worker_summaries", org.apache.storm.thrift.protocol.TType.LIST, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorPageInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorPageInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorPageInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorPageInfoTupleSchemeFactory();
 
   private java.util.List<SupervisorSummary> supervisor_summaries; // optional
   private java.util.List<WorkerSummary> worker_summaries; // 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 {
     SUPERVISOR_SUMMARIES((short)1, "supervisor_summaries"),
     WORKER_SUMMARIES((short)2, "worker_summaries");
 
@@ -100,17 +100,17 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.SUPERVISOR_SUMMARIES,_Fields.WORKER_SUMMARIES};
-  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.SUPERVISOR_SUMMARIES, new org.apache.thrift.meta_data.FieldMetaData("supervisor_summaries", 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, SupervisorSummary.class))));
-    tmpMap.put(_Fields.WORKER_SUMMARIES, new org.apache.thrift.meta_data.FieldMetaData("worker_summaries", 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, WorkerSummary.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.SUPERVISOR_SUMMARIES, new org.apache.storm.thrift.meta_data.FieldMetaData("supervisor_summaries", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SupervisorSummary.class))));
+    tmpMap.put(_Fields.WORKER_SUMMARIES, new org.apache.storm.thrift.meta_data.FieldMetaData("worker_summaries", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, WorkerSummary.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorPageInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorPageInfo.class, metaDataMap);
   }
 
   public SupervisorPageInfo() {
@@ -334,7 +334,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
       return lastComparison;
     }
     if (is_set_supervisor_summaries()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_summaries, other.supervisor_summaries);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.supervisor_summaries, other.supervisor_summaries);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -344,7 +344,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
       return lastComparison;
     }
     if (is_set_worker_summaries()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.worker_summaries, other.worker_summaries);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.worker_summaries, other.worker_summaries);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -356,11 +356,11 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
     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);
   }
 
@@ -392,49 +392,49 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 SupervisorPageInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorPageInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorPageInfoStandardScheme getScheme() {
       return new SupervisorPageInfoStandardScheme();
     }
   }
 
-  private static class SupervisorPageInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorPageInfo> {
+  private static class SupervisorPageInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SupervisorPageInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorPageInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SupervisorPageInfo 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: // SUPERVISOR_SUMMARIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list466 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list466 = iprot.readListBegin();
                 struct.supervisor_summaries = new java.util.ArrayList<SupervisorSummary>(_list466.size);
                 SupervisorSummary _elem467;
                 for (int _i468 = 0; _i468 < _list466.size; ++_i468)
@@ -447,13 +447,13 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
               }
               struct.set_supervisor_summaries_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: // WORKER_SUMMARIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list469 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list469 = iprot.readListBegin();
                 struct.worker_summaries = new java.util.ArrayList<WorkerSummary>(_list469.size);
                 WorkerSummary _elem470;
                 for (int _i471 = 0; _i471 < _list469.size; ++_i471)
@@ -466,11 +466,11 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
               }
               struct.set_worker_summaries_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();
       }
@@ -478,7 +478,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorPageInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SupervisorPageInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -486,7 +486,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
         if (struct.is_set_supervisor_summaries()) {
           oprot.writeFieldBegin(SUPERVISOR_SUMMARIES_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.supervisor_summaries.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.supervisor_summaries.size()));
             for (SupervisorSummary _iter472 : struct.supervisor_summaries)
             {
               _iter472.write(oprot);
@@ -500,7 +500,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
         if (struct.is_set_worker_summaries()) {
           oprot.writeFieldBegin(WORKER_SUMMARIES_FIELD_DESC);
           {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.worker_summaries.size()));
+            oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.worker_summaries.size()));
             for (WorkerSummary _iter473 : struct.worker_summaries)
             {
               _iter473.write(oprot);
@@ -516,17 +516,17 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
 
   }
 
-  private static class SupervisorPageInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorPageInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorPageInfoTupleScheme getScheme() {
       return new SupervisorPageInfoTupleScheme();
     }
   }
 
-  private static class SupervisorPageInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorPageInfo> {
+  private static class SupervisorPageInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SupervisorPageInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorPageInfo 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, SupervisorPageInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_supervisor_summaries()) {
         optionals.set(0);
@@ -556,12 +556,12 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorPageInfo 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, SupervisorPageInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list476 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list476 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.supervisor_summaries = new java.util.ArrayList<SupervisorSummary>(_list476.size);
           SupervisorSummary _elem477;
           for (int _i478 = 0; _i478 < _list476.size; ++_i478)
@@ -575,7 +575,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list479 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.worker_summaries = new java.util.ArrayList<WorkerSummary>(_list479.size);
           WorkerSummary _elem480;
           for (int _i481 = 0; _i481 < _list479.size; ++_i481)
@@ -590,8 +590,8 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
index ed1bf68..79199c3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPCInvocations.java
@@ -29,55 +29,55 @@ public class DistributedRPCInvocations {
 
   public interface Iface {
 
-    public void result(java.lang.String id, java.lang.String result) throws AuthorizationException, org.apache.thrift.TException;
+    public void result(java.lang.String id, java.lang.String result) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public DRPCRequest fetchRequest(java.lang.String functionName) throws AuthorizationException, org.apache.thrift.TException;
+    public DRPCRequest fetchRequest(java.lang.String functionName) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void failRequest(java.lang.String id) throws AuthorizationException, org.apache.thrift.TException;
+    public void failRequest(java.lang.String id) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void failRequestV2(java.lang.String id, DRPCExecutionException e) throws AuthorizationException, org.apache.thrift.TException;
+    public void failRequestV2(java.lang.String id, DRPCExecutionException e) throws AuthorizationException, org.apache.storm.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void result(java.lang.String id, java.lang.String result, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void result(java.lang.String id, java.lang.String result, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void fetchRequest(java.lang.String functionName, org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.thrift.TException;
+    public void fetchRequest(java.lang.String functionName, org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void failRequest(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void failRequest(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void failRequestV2(java.lang.String id, DRPCExecutionException e, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void failRequestV2(java.lang.String id, DRPCExecutionException e, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
-    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+  public static class Client extends org.apache.storm.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.storm.thrift.TServiceClientFactory<Client> {
       public Factory() {}
-      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
-      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol prot)
+    public Client(org.apache.storm.thrift.protocol.TProtocol prot)
     {
       super(prot, prot);
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+    public Client(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
       super(iprot, oprot);
     }
 
-    public void result(java.lang.String id, java.lang.String result) throws AuthorizationException, org.apache.thrift.TException
+    public void result(java.lang.String id, java.lang.String result) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_result(id, result);
       recv_result();
     }
 
-    public void send_result(java.lang.String id, java.lang.String result) throws org.apache.thrift.TException
+    public void send_result(java.lang.String id, java.lang.String result) throws org.apache.storm.thrift.TException
     {
       result_args args = new result_args();
       args.set_id(id);
@@ -85,7 +85,7 @@ public class DistributedRPCInvocations {
       sendBase("result", args);
     }
 
-    public void recv_result() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_result() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       result_result result = new result_result();
       receiveBase(result, "result");
@@ -95,20 +95,20 @@ public class DistributedRPCInvocations {
       return;
     }
 
-    public DRPCRequest fetchRequest(java.lang.String functionName) throws AuthorizationException, org.apache.thrift.TException
+    public DRPCRequest fetchRequest(java.lang.String functionName) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_fetchRequest(functionName);
       return recv_fetchRequest();
     }
 
-    public void send_fetchRequest(java.lang.String functionName) throws org.apache.thrift.TException
+    public void send_fetchRequest(java.lang.String functionName) throws org.apache.storm.thrift.TException
     {
       fetchRequest_args args = new fetchRequest_args();
       args.set_functionName(functionName);
       sendBase("fetchRequest", args);
     }
 
-    public DRPCRequest recv_fetchRequest() throws AuthorizationException, org.apache.thrift.TException
+    public DRPCRequest recv_fetchRequest() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       fetchRequest_result result = new fetchRequest_result();
       receiveBase(result, "fetchRequest");
@@ -118,23 +118,23 @@ public class DistributedRPCInvocations {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "fetchRequest failed: unknown result");
     }
 
-    public void failRequest(java.lang.String id) throws AuthorizationException, org.apache.thrift.TException
+    public void failRequest(java.lang.String id) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_failRequest(id);
       recv_failRequest();
     }
 
-    public void send_failRequest(java.lang.String id) throws org.apache.thrift.TException
+    public void send_failRequest(java.lang.String id) throws org.apache.storm.thrift.TException
     {
       failRequest_args args = new failRequest_args();
       args.set_id(id);
       sendBase("failRequest", args);
     }
 
-    public void recv_failRequest() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_failRequest() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       failRequest_result result = new failRequest_result();
       receiveBase(result, "failRequest");
@@ -144,13 +144,13 @@ public class DistributedRPCInvocations {
       return;
     }
 
-    public void failRequestV2(java.lang.String id, DRPCExecutionException e) throws AuthorizationException, org.apache.thrift.TException
+    public void failRequestV2(java.lang.String id, DRPCExecutionException e) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_failRequestV2(id, e);
       recv_failRequestV2();
     }
 
-    public void send_failRequestV2(java.lang.String id, DRPCExecutionException e) throws org.apache.thrift.TException
+    public void send_failRequestV2(java.lang.String id, DRPCExecutionException e) throws org.apache.storm.thrift.TException
     {
       failRequestV2_args args = new failRequestV2_args();
       args.set_id(id);
@@ -158,7 +158,7 @@ public class DistributedRPCInvocations {
       sendBase("failRequestV2", args);
     }
 
-    public void recv_failRequestV2() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_failRequestV2() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       failRequestV2_result result = new failRequestV2_result();
       receiveBase(result, "failRequestV2");
@@ -169,41 +169,41 @@ public class DistributedRPCInvocations {
     }
 
   }
-  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
-    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
-      private org.apache.thrift.async.TAsyncClientManager clientManager;
-      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
-      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+  public static class AsyncClient extends org.apache.storm.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.storm.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.storm.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.storm.thrift.async.TAsyncClientManager clientManager, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory) {
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
-      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+      public AsyncClient getAsyncClient(org.apache.storm.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
     }
 
-    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+    public AsyncClient(org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.async.TAsyncClientManager clientManager, org.apache.storm.thrift.transport.TNonblockingTransport transport) {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void result(java.lang.String id, java.lang.String result, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void result(java.lang.String id, java.lang.String result, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       result_call method_call = new result_call(id, result, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class result_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+    public static class result_call extends org.apache.storm.thrift.async.TAsyncMethodCall<Void> {
       private java.lang.String id;
       private java.lang.String result;
-      public result_call(java.lang.String id, java.lang.String result, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public result_call(java.lang.String id, java.lang.String result, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.id = id;
         this.result = result;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("result", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("result", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         result_args args = new result_args();
         args.set_id(id);
         args.set_result(result);
@@ -211,98 +211,98 @@ public class DistributedRPCInvocations {
         prot.writeMessageEnd();
       }
 
-      public Void getResult() throws AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return null;
       }
     }
 
-    public void fetchRequest(java.lang.String functionName, org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.thrift.TException {
+    public void fetchRequest(java.lang.String functionName, org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       fetchRequest_call method_call = new fetchRequest_call(functionName, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class fetchRequest_call extends org.apache.thrift.async.TAsyncMethodCall<DRPCRequest> {
+    public static class fetchRequest_call extends org.apache.storm.thrift.async.TAsyncMethodCall<DRPCRequest> {
       private java.lang.String functionName;
-      public fetchRequest_call(java.lang.String functionName, org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public fetchRequest_call(java.lang.String functionName, org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.functionName = functionName;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("fetchRequest", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("fetchRequest", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         fetchRequest_args args = new fetchRequest_args();
         args.set_functionName(functionName);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public DRPCRequest getResult() throws AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public DRPCRequest getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return (new Client(prot)).recv_fetchRequest();
       }
     }
 
-    public void failRequest(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void failRequest(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       failRequest_call method_call = new failRequest_call(id, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class failRequest_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+    public static class failRequest_call extends org.apache.storm.thrift.async.TAsyncMethodCall<Void> {
       private java.lang.String id;
-      public failRequest_call(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public failRequest_call(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.id = id;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("failRequest", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("failRequest", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         failRequest_args args = new failRequest_args();
         args.set_id(id);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public Void getResult() throws AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return null;
       }
     }
 
-    public void failRequestV2(java.lang.String id, DRPCExecutionException e, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void failRequestV2(java.lang.String id, DRPCExecutionException e, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       failRequestV2_call method_call = new failRequestV2_call(id, e, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class failRequestV2_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+    public static class failRequestV2_call extends org.apache.storm.thrift.async.TAsyncMethodCall<Void> {
       private java.lang.String id;
       private DRPCExecutionException e;
-      public failRequestV2_call(java.lang.String id, DRPCExecutionException e, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public failRequestV2_call(java.lang.String id, DRPCExecutionException e, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.id = id;
         this.e = e;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("failRequestV2", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("failRequestV2", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         failRequestV2_args args = new failRequestV2_args();
         args.set_id(id);
         args.set_e(e);
@@ -310,29 +310,29 @@ public class DistributedRPCInvocations {
         prot.writeMessageEnd();
       }
 
-      public Void getResult() throws AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return null;
       }
     }
 
   }
 
-  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
+  public static class Processor<I extends Iface> extends org.apache.storm.thrift.TBaseProcessor<I> implements org.apache.storm.thrift.TProcessor {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends  org.apache.storm.thrift.TBase>> processMap) {
       processMap.put("result", new result());
       processMap.put("fetchRequest", new fetchRequest());
       processMap.put("failRequest", new failRequest());
@@ -340,7 +340,7 @@ public class DistributedRPCInvocations {
       return processMap;
     }
 
-    public static class result<I extends Iface> extends org.apache.thrift.ProcessFunction<I, result_args> {
+    public static class result<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, result_args> {
       public result() {
         super("result");
       }
@@ -358,7 +358,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public result_result getResult(I iface, result_args args) throws org.apache.thrift.TException {
+      public result_result getResult(I iface, result_args args) throws org.apache.storm.thrift.TException {
         result_result result = new result_result();
         try {
           iface.result(args.id, args.result);
@@ -369,7 +369,7 @@ public class DistributedRPCInvocations {
       }
     }
 
-    public static class fetchRequest<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetchRequest_args> {
+    public static class fetchRequest<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, fetchRequest_args> {
       public fetchRequest() {
         super("fetchRequest");
       }
@@ -387,7 +387,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.thrift.TException {
+      public fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.storm.thrift.TException {
         fetchRequest_result result = new fetchRequest_result();
         try {
           result.success = iface.fetchRequest(args.functionName);
@@ -398,7 +398,7 @@ public class DistributedRPCInvocations {
       }
     }
 
-    public static class failRequest<I extends Iface> extends org.apache.thrift.ProcessFunction<I, failRequest_args> {
+    public static class failRequest<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, failRequest_args> {
       public failRequest() {
         super("failRequest");
       }
@@ -416,7 +416,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public failRequest_result getResult(I iface, failRequest_args args) throws org.apache.thrift.TException {
+      public failRequest_result getResult(I iface, failRequest_args args) throws org.apache.storm.thrift.TException {
         failRequest_result result = new failRequest_result();
         try {
           iface.failRequest(args.id);
@@ -427,7 +427,7 @@ public class DistributedRPCInvocations {
       }
     }
 
-    public static class failRequestV2<I extends Iface> extends org.apache.thrift.ProcessFunction<I, failRequestV2_args> {
+    public static class failRequestV2<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, failRequestV2_args> {
       public failRequestV2() {
         super("failRequestV2");
       }
@@ -445,7 +445,7 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public failRequestV2_result getResult(I iface, failRequestV2_args args) throws org.apache.thrift.TException {
+      public failRequestV2_result getResult(I iface, failRequestV2_args args) throws org.apache.storm.thrift.TException {
         failRequestV2_result result = new failRequestV2_result();
         try {
           iface.failRequestV2(args.id, args.e);
@@ -458,17 +458,17 @@ public class DistributedRPCInvocations {
 
   }
 
-  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.storm.thrift.TBaseAsyncProcessor<I> {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.storm.thrift.AsyncProcessFunction<I, ? extends org.apache.storm.thrift.TBase, ?>>()));
     }
 
-    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase, ?>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase, ?>> processMap) {
       processMap.put("result", new result());
       processMap.put("fetchRequest", new fetchRequest());
       processMap.put("failRequest", new failRequest());
@@ -476,7 +476,7 @@ public class DistributedRPCInvocations {
       return processMap;
     }
 
-    public static class result<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, result_args, Void> {
+    public static class result<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, result_args, Void> {
       public result() {
         super("result");
       }
@@ -485,14 +485,14 @@ public class DistributedRPCInvocations {
         return new result_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             result_result result = new result_result();
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -501,25 +501,25 @@ public class DistributedRPCInvocations {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             result_result result = new result_result();
             if (e instanceof AuthorizationException) {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -535,12 +535,12 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public void start(I iface, result_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, result_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.result(args.id, args.result,resultHandler);
       }
     }
 
-    public static class fetchRequest<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fetchRequest_args, DRPCRequest> {
+    public static class fetchRequest<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, fetchRequest_args, DRPCRequest> {
       public fetchRequest() {
         super("fetchRequest");
       }
@@ -549,15 +549,15 @@ public class DistributedRPCInvocations {
         return new fetchRequest_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<DRPCRequest>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest>() { 
           public void onComplete(DRPCRequest o) {
             fetchRequest_result result = new fetchRequest_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -566,25 +566,25 @@ public class DistributedRPCInvocations {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             fetchRequest_result result = new fetchRequest_result();
             if (e instanceof AuthorizationException) {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -600,12 +600,12 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public void start(I iface, fetchRequest_args args, org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, fetchRequest_args args, org.apache.storm.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws org.apache.storm.thrift.TException {
         iface.fetchRequest(args.functionName,resultHandler);
       }
     }
 
-    public static class failRequest<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, failRequest_args, Void> {
+    public static class failRequest<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, failRequest_args, Void> {
       public failRequest() {
         super("failRequest");
       }
@@ -614,14 +614,14 @@ public class DistributedRPCInvocations {
         return new failRequest_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             failRequest_result result = new failRequest_result();
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -630,25 +630,25 @@ public class DistributedRPCInvocations {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             failRequest_result result = new failRequest_result();
             if (e instanceof AuthorizationException) {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -664,12 +664,12 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public void start(I iface, failRequest_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, failRequest_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.failRequest(args.id,resultHandler);
       }
     }
 
-    public static class failRequestV2<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, failRequestV2_args, Void> {
+    public static class failRequestV2<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, failRequestV2_args, Void> {
       public failRequestV2() {
         super("failRequestV2");
       }
@@ -678,14 +678,14 @@ public class DistributedRPCInvocations {
         return new failRequestV2_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             failRequestV2_result result = new failRequestV2_result();
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -694,25 +694,25 @@ public class DistributedRPCInvocations {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             failRequestV2_result result = new failRequestV2_result();
             if (e instanceof AuthorizationException) {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -728,27 +728,27 @@ public class DistributedRPCInvocations {
         return false;
       }
 
-      public void start(I iface, failRequestV2_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, failRequestV2_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.failRequestV2(args.id, args.e,resultHandler);
       }
     }
 
   }
 
-  public static class result_args implements org.apache.thrift.TBase<result_args, result_args._Fields>, java.io.Serializable, Cloneable, Comparable<result_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_args");
+  public static class result_args implements org.apache.storm.thrift.TBase<result_args, result_args._Fields>, java.io.Serializable, Cloneable, Comparable<result_args>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("result_args");
 
-    private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.storm.thrift.protocol.TField ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("result", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new result_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new result_argsTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new result_argsStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new result_argsTupleSchemeFactory();
 
     private java.lang.String id; // required
     private java.lang.String result; // 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 {
       ID((short)1, "id"),
       RESULT((short)2, "result");
 
@@ -809,15 +809,15 @@ public class DistributedRPCInvocations {
     }
 
     // isset id assignments
-    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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESULT, new org.apache.thrift.meta_data.FieldMetaData("result", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      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.ID, new org.apache.storm.thrift.meta_data.FieldMetaData("id", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.RESULT, new org.apache.storm.thrift.meta_data.FieldMetaData("result", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_args.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_args.class, metaDataMap);
     }
 
     public result_args() {
@@ -1012,7 +1012,7 @@ public class DistributedRPCInvocations {
         return lastComparison;
       }
       if (is_set_id()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id, other.id);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1022,7 +1022,7 @@ public class DistributedRPCInvocations {
         return lastComparison;
       }
       if (is_set_result()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, other.result);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.result, other.result);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1034,11 +1034,11 @@ public class DistributedRPCInvocations {
       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);
     }
 
@@ -1066,63 +1066,63 @@ public class DistributedRPCInvocations {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 result_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class result_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public result_argsStandardScheme getScheme() {
         return new result_argsStandardScheme();
       }
     }
 
-    private static class result_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<result_args> {
+    private static class result_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<result_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, result_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, result_args 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: // ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.id = iprot.readString();
                 struct.set_id_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: // RESULT
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.result = iprot.readString();
                 struct.set_result_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();
         }
@@ -1130,7 +1130,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, result_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, result_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1150,17 +1150,17 @@ public class DistributedRPCInvocations {
 
     }
 
-    private static class result_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class result_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public result_argsTupleScheme getScheme() {
         return new result_argsTupleScheme();
       }
     }
 
-    private static class result_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<result_args> {
+    private static class result_argsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<result_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, result_args 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, result_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_id()) {
           optionals.set(0);
@@ -1178,8 +1178,8 @@ public class DistributedRPCInvocations {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, result_args 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, result_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.id = iprot.readString();
@@ -1192,23 +1192,23 @@ public class DistributedRPCInvocations {
       }
     }
 
-    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();
     }
   }
 
-  public static class result_result implements org.apache.thrift.TBase<result_result, result_result._Fields>, java.io.Serializable, Cloneable, Comparable<result_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_result");
+  public static class result_result implements org.apache.storm.thrift.TBase<result_result, result_result._Fields>, java.io.Serializable, Cloneable, Comparable<result_result>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("result_result");
 
-    private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("aze", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new result_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new result_resultTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new result_resultStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new result_resultTupleSchemeFactory();
 
     private AuthorizationException aze; // 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 {
       AZE((short)1, "aze");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -1266,13 +1266,13 @@ public class DistributedRPCInvocations {
     }
 
     // isset id assignments
-    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.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AuthorizationException.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.AZE, new org.apache.storm.thrift.meta_data.FieldMetaData("aze", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, AuthorizationException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_result.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(result_result.class, metaDataMap);
     }
 
     public result_result() {
@@ -1412,7 +1412,7 @@ public class DistributedRPCInvocations {
         return lastComparison;
       }
       if (is_set_aze()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.aze, other.aze);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1424,11 +1424,11 @@ public class DistributedRPCInvocations {
       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);
       }
 
@@ -1448,56 +1448,56 @@ public class DistributedRPCInvocations {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 result_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class result_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public result_resultStandardScheme getScheme() {
         return new result_resultStandardScheme();
       }
     }
 
-    private static class result_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<result_result> {
+    private static class result_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<result_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, result_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, result_result 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: // AZE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
                 struct.aze = new AuthorizationException();
                 struct.aze.read(iprot);
                 struct.set_aze_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();
         }
@@ -1505,7 +1505,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, result_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, result_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1520,17 +1520,17 @@ public class DistributedRPCInvocations {
 
     }
 
-    private static class result_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class result_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public result_resultTupleScheme getScheme() {
         return new result_resultTupleScheme();
       }
     }
 
-    private static class result_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<result_result> {
+    private static class result_resultTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<result_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, result_result 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, result_result struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_aze()) {
           optionals.set(0);
@@ -1542,8 +1542,8 @@ public class DistributedRPCInvocations {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, result_result 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, result_result struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.aze = new AuthorizationException();
@@ -1553,23 +1553,23 @@ public class DistributedRPCInvocations {
       }
     }
 
-    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();
     }
   }
 
-  public static class fetchRequest_args implements org.apache.thrift.TBase<fetchRequest_args, fetchRequest_args._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_args");
+  public static class fetchRequest_args implements org.apache.storm.thrift.TBase<fetchRequest_args, fetchRequest_args._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_args>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("fetchRequest_args");
 
-    private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("functionName", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new fetchRequest_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new fetchRequest_argsTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new fetchRequest_argsStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new fetchRequest_argsTupleSchemeFactory();
 
     private java.lang.String functionName; // 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 {
       FUNCTION_NAME((short)1, "functionName");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -1627,13 +1627,13 @@ public class DistributedRPCInvocations {
     }
 
     // isset id assignments
-    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.FUNCTION_NAME, new org.apache.thrift.meta_data.FieldMetaData("functionName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      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.FUNCTION_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("functionName", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_args.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(fetchRequest_args.class, metaDataMap);
     }
 
     public fetchRequest_args() {
@@ -1773,7 +1773,7 @@ public class DistributedRPCInvocations {
         return lastComparison;
       }
       if (is_set_functionName()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1785,11 +1785,11 @@ public class DistributedRPCInvocations {
       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);
     }
 
@@ -1809,55 +1809,55 @@ public class DistributedRPCInvocations {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 fetchRequest_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class fetchRequest_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public fetchRequest_argsStandardScheme getScheme() {
         return new fetchRequest_argsStandardScheme();
       }
     }
 
-    private static class fetchRequest_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<fetchRequest_args> {
+    private static class fetchRequest_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<fetchRequest_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, fetchRequest_args 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: // FUNCTION_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.functionName = iprot.readString();
                 struct.set_functionName_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();
         }
@@ -1865,7 +1865,7 @@ public class DistributedRPCInvocations {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, fetchRequest_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, fetchRequest_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1880,17 +1880,17 @@ public class DistributedRPCInvocations {
 
     }
 
-    private static class fetchRequest_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class fetchRequest_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public fetchRequest_argsTupleScheme getScheme() {
         return new fetchRequest_argsTupleScheme();
       }
     }
 
-    private static class fetchRequest_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<fetchRequest_args> {
+    private static class fetchRequest_argsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<fetchRequest_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args 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, fetchRequest_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_functionName()) {
           optionals.set(0);
@@ -1902,8 +1902,8 @@ public class DistributedRPCInvocations {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args 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, fetchRequest_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.functionName = iprot.readString();
@@ -1912,25 +1912,25 @@ public class DistributedRPCInvocations {
       }
     }
 
-    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();
     }
   }
 
-  public static class fetchRequest_result implements org.apache.thrift.TBase<fetchRequest_result, fetchRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_result");
+  public static class fetchRequest_result implements org.apache.storm.thrift.TBase<fetchRequest_result, fetchRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_result>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("fetchRequest_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
-    private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("success", org.apache.storm.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.storm.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("aze", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new fetchRequest_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new fetchRequest_resultTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new fetchRequest_resultStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new fetchRequest_resultTupleSchemeFactory();
 
     private DRPCRequest success; // required
     private AuthorizationException aze; // 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 {
       SUCCESS((short)0, "success"),
       AZE((short)1, "aze");
 
@@ -1991,15 +1991,15 @@ public class DistributedRPCInvocations {
     }
 
     // isset id assignments
-    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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DRPCRequest.class)));
-      tmpMap.put(_Fields.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.T

<TRUNCATED>

[09/50] [abbrv] storm git commit: STORM-2882: sysout-over-slf4j

Posted by bo...@apache.org.
STORM-2882: sysout-over-slf4j


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

Branch: refs/heads/master
Commit: e584c610fc0507a4059f681ae6983c8a5a2fff95
Parents: 60da0ef
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 30 15:04:15 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 shaded-deps/pom.xml                                         | 9 +++++++++
 storm-client/pom.xml                                        | 5 -----
 .../src/jvm/org/apache/storm/daemon/worker/Worker.java      | 2 +-
 .../src/main/java/org/apache/storm/pacemaker/Pacemaker.java | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e584c610/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 391d6fa..1ff6cb2 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -135,6 +135,10 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>uk.org.lidalia</groupId>
+            <artifactId>sysout-over-slf4j</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -171,6 +175,7 @@
                             <include>org.jctools:jctools-core</include>
                             <include>org.jgrapht:jgrapht-core</include>
                             <include>org.yaml:snakeyaml</include>
+                            <include>uk.org.lidalia:sysout-over-slf4j</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -236,6 +241,10 @@
                             <pattern>org.apache.commons.codec</pattern>
                             <shadedPattern>org.apache.storm.shade.org.apache.commons.codec</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>uk.org.lidalia.sysoutslf4j</pattern>
+                            <shadedPattern>org.apache.storm.shade.uk.org.lidalia.sysoutslf4j</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

http://git-wip-us.apache.org/repos/asf/storm/blob/e584c610/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index b86a2bd..3fa4b4d 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -42,11 +42,6 @@
     This is here as a work around to place it at the beginning of the classpath
     even though maven does not officially support ordering of the classpath.-->
         <dependency>
-            <groupId>uk.org.lidalia</groupId>
-            <artifactId>sysout-over-slf4j</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/storm/blob/e584c610/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
index 291cba8..1a7869e 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
@@ -54,6 +54,7 @@ import org.apache.storm.security.auth.IAutoCredentials;
 import org.apache.storm.shade.com.google.common.base.Preconditions;
 import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.apache.storm.shade.org.apache.commons.lang.ObjectUtils;
+import org.apache.storm.shade.uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
 import org.apache.storm.stats.StatsUtil;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.LocalState;
@@ -64,7 +65,6 @@ import org.apache.storm.utils.Time;
 import org.apache.storm.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
 
 public class Worker implements Shutdownable, DaemonCommon {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e584c610/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java b/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
index ff283a4..66e14fa 100644
--- a/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
+++ b/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
@@ -27,12 +27,12 @@ import org.apache.storm.generated.HBNodes;
 import org.apache.storm.generated.HBPulse;
 import org.apache.storm.generated.HBServerMessageType;
 import org.apache.storm.metric.StormMetricsRegistry;
+import org.apache.storm.shade.uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.VersionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
 
 
 public class Pacemaker implements IServerMessageHandler {


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/OwnerResourceSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/OwnerResourceSummary.java b/storm-client/src/jvm/org/apache/storm/generated/OwnerResourceSummary.java
index ee273d3..0f0da8f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/OwnerResourceSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/OwnerResourceSummary.java
@@ -25,30 +25,30 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResourceSummary, OwnerResourceSummary._Fields>, java.io.Serializable, Cloneable, Comparable<OwnerResourceSummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OwnerResourceSummary");
-
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TOTAL_TOPOLOGIES_FIELD_DESC = new org.apache.thrift.protocol.TField("total_topologies", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField TOTAL_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("total_executors", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField TOTAL_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("total_workers", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField MEMORY_USAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("memory_usage", org.apache.thrift.protocol.TType.DOUBLE, (short)5);
-  private static final org.apache.thrift.protocol.TField CPU_USAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu_usage", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
-  private static final org.apache.thrift.protocol.TField MEMORY_GUARANTEE_FIELD_DESC = new org.apache.thrift.protocol.TField("memory_guarantee", org.apache.thrift.protocol.TType.DOUBLE, (short)7);
-  private static final org.apache.thrift.protocol.TField CPU_GUARANTEE_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu_guarantee", org.apache.thrift.protocol.TType.DOUBLE, (short)8);
-  private static final org.apache.thrift.protocol.TField MEMORY_GUARANTEE_REMAINING_FIELD_DESC = new org.apache.thrift.protocol.TField("memory_guarantee_remaining", org.apache.thrift.protocol.TType.DOUBLE, (short)9);
-  private static final org.apache.thrift.protocol.TField CPU_GUARANTEE_REMAINING_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu_guarantee_remaining", org.apache.thrift.protocol.TType.DOUBLE, (short)10);
-  private static final org.apache.thrift.protocol.TField ISOLATED_NODE_GUARANTEE_FIELD_DESC = new org.apache.thrift.protocol.TField("isolated_node_guarantee", org.apache.thrift.protocol.TType.I32, (short)11);
-  private static final org.apache.thrift.protocol.TField TOTAL_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("total_tasks", org.apache.thrift.protocol.TType.I32, (short)12);
-  private static final org.apache.thrift.protocol.TField REQUESTED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_on_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)13);
-  private static final org.apache.thrift.protocol.TField REQUESTED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_off_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)14);
-  private static final org.apache.thrift.protocol.TField REQUESTED_TOTAL_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_total_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)15);
-  private static final org.apache.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)16);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_on_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)17);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_off_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)18);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new OwnerResourceSummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new OwnerResourceSummaryTupleSchemeFactory();
+public class OwnerResourceSummary implements org.apache.storm.thrift.TBase<OwnerResourceSummary, OwnerResourceSummary._Fields>, java.io.Serializable, Cloneable, Comparable<OwnerResourceSummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("OwnerResourceSummary");
+
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_TOPOLOGIES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_topologies", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_executors", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_workers", org.apache.storm.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField MEMORY_USAGE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("memory_usage", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField CPU_USAGE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("cpu_usage", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField MEMORY_GUARANTEE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("memory_guarantee", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField CPU_GUARANTEE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("cpu_guarantee", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField MEMORY_GUARANTEE_REMAINING_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("memory_guarantee_remaining", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField CPU_GUARANTEE_REMAINING_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("cpu_guarantee_remaining", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)10);
+  private static final org.apache.storm.thrift.protocol.TField ISOLATED_NODE_GUARANTEE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("isolated_node_guarantee", org.apache.storm.thrift.protocol.TType.I32, (short)11);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_TASKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_tasks", org.apache.storm.thrift.protocol.TType.I32, (short)12);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_on_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)13);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_off_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)14);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_TOTAL_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_total_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)15);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)16);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_on_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)17);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_off_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)18);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new OwnerResourceSummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new OwnerResourceSummaryTupleSchemeFactory();
 
   private java.lang.String owner; // required
   private int total_topologies; // optional
@@ -70,7 +70,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   private double assigned_off_heap_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 {
     OWNER((short)1, "owner"),
     TOTAL_TOPOLOGIES((short)2, "total_topologies"),
     TOTAL_EXECUTORS((short)3, "total_executors"),
@@ -198,47 +198,47 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   private static final int __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID = 16;
   private int __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TOTAL_TOPOLOGIES,_Fields.TOTAL_EXECUTORS,_Fields.TOTAL_WORKERS,_Fields.MEMORY_USAGE,_Fields.CPU_USAGE,_Fields.MEMORY_GUARANTEE,_Fields.CPU_GUARANTEE,_Fields.MEMORY_GUARANTEE_REMAINING,_Fields.CPU_GUARANTEE_REMAINING,_Fields.ISOLATED_NODE_GUARANTEE,_Fields.TOTAL_TASKS,_Fields.REQUESTED_ON_HEAP_MEMORY,_Fields.REQUESTED_OFF_HEAP_MEMORY,_Fields.REQUESTED_TOTAL_MEMORY,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_ON_HEAP_MEMORY,_Fields.ASSIGNED_OFF_HEAP_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.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOTAL_TOPOLOGIES, new org.apache.thrift.meta_data.FieldMetaData("total_topologies", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOTAL_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("total_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOTAL_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("total_workers", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.MEMORY_USAGE, new org.apache.thrift.meta_data.FieldMetaData("memory_usage", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.CPU_USAGE, new org.apache.thrift.meta_data.FieldMetaData("cpu_usage", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.MEMORY_GUARANTEE, new org.apache.thrift.meta_data.FieldMetaData("memory_guarantee", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.CPU_GUARANTEE, new org.apache.thrift.meta_data.FieldMetaData("cpu_guarantee", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.MEMORY_GUARANTEE_REMAINING, new org.apache.thrift.meta_data.FieldMetaData("memory_guarantee_remaining", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.CPU_GUARANTEE_REMAINING, new org.apache.thrift.meta_data.FieldMetaData("cpu_guarantee_remaining", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ISOLATED_NODE_GUARANTEE, new org.apache.thrift.meta_data.FieldMetaData("isolated_node_guarantee", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOTAL_TASKS, new org.apache.thrift.meta_data.FieldMetaData("total_tasks", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.REQUESTED_ON_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_on_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_OFF_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_off_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_TOTAL_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_total_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_ON_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("assigned_on_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_OFF_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("assigned_off_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOTAL_TOPOLOGIES, new org.apache.storm.thrift.meta_data.FieldMetaData("total_topologies", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOTAL_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("total_executors", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOTAL_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("total_workers", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.MEMORY_USAGE, new org.apache.storm.thrift.meta_data.FieldMetaData("memory_usage", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.CPU_USAGE, new org.apache.storm.thrift.meta_data.FieldMetaData("cpu_usage", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.MEMORY_GUARANTEE, new org.apache.storm.thrift.meta_data.FieldMetaData("memory_guarantee", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.CPU_GUARANTEE, new org.apache.storm.thrift.meta_data.FieldMetaData("cpu_guarantee", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.MEMORY_GUARANTEE_REMAINING, new org.apache.storm.thrift.meta_data.FieldMetaData("memory_guarantee_remaining", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.CPU_GUARANTEE_REMAINING, new org.apache.storm.thrift.meta_data.FieldMetaData("cpu_guarantee_remaining", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ISOLATED_NODE_GUARANTEE, new org.apache.storm.thrift.meta_data.FieldMetaData("isolated_node_guarantee", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOTAL_TASKS, new org.apache.storm.thrift.meta_data.FieldMetaData("total_tasks", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.REQUESTED_ON_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_on_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_OFF_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_off_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_TOTAL_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_total_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_ON_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_on_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_OFF_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_off_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OwnerResourceSummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OwnerResourceSummary.class, metaDataMap);
   }
 
   public OwnerResourceSummary() {
@@ -354,16 +354,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_total_topologies() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_TOPOLOGIES_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_TOPOLOGIES_ISSET_ID);
   }
 
   /** Returns true if field total_topologies is set (has been assigned a value) and false otherwise */
   public boolean is_set_total_topologies() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_TOPOLOGIES_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_TOPOLOGIES_ISSET_ID);
   }
 
   public void set_total_topologies_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_TOPOLOGIES_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_TOPOLOGIES_ISSET_ID, value);
   }
 
   public int get_total_executors() {
@@ -376,16 +376,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_total_executors() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field total_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_total_executors() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_EXECUTORS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_EXECUTORS_ISSET_ID);
   }
 
   public void set_total_executors_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_EXECUTORS_ISSET_ID, value);
   }
 
   public int get_total_workers() {
@@ -398,16 +398,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_total_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field total_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_total_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_WORKERS_ISSET_ID);
   }
 
   public void set_total_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_WORKERS_ISSET_ID, value);
   }
 
   public double get_memory_usage() {
@@ -420,16 +420,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_memory_usage() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEMORY_USAGE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEMORY_USAGE_ISSET_ID);
   }
 
   /** Returns true if field memory_usage is set (has been assigned a value) and false otherwise */
   public boolean is_set_memory_usage() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MEMORY_USAGE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __MEMORY_USAGE_ISSET_ID);
   }
 
   public void set_memory_usage_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MEMORY_USAGE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MEMORY_USAGE_ISSET_ID, value);
   }
 
   public double get_cpu_usage() {
@@ -442,16 +442,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_cpu_usage() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_USAGE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_USAGE_ISSET_ID);
   }
 
   /** Returns true if field cpu_usage is set (has been assigned a value) and false otherwise */
   public boolean is_set_cpu_usage() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_USAGE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_USAGE_ISSET_ID);
   }
 
   public void set_cpu_usage_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_USAGE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_USAGE_ISSET_ID, value);
   }
 
   public double get_memory_guarantee() {
@@ -464,16 +464,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_memory_guarantee() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEMORY_GUARANTEE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEMORY_GUARANTEE_ISSET_ID);
   }
 
   /** Returns true if field memory_guarantee is set (has been assigned a value) and false otherwise */
   public boolean is_set_memory_guarantee() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MEMORY_GUARANTEE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __MEMORY_GUARANTEE_ISSET_ID);
   }
 
   public void set_memory_guarantee_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MEMORY_GUARANTEE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MEMORY_GUARANTEE_ISSET_ID, value);
   }
 
   public double get_cpu_guarantee() {
@@ -486,16 +486,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_cpu_guarantee() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_GUARANTEE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_GUARANTEE_ISSET_ID);
   }
 
   /** Returns true if field cpu_guarantee is set (has been assigned a value) and false otherwise */
   public boolean is_set_cpu_guarantee() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_GUARANTEE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_GUARANTEE_ISSET_ID);
   }
 
   public void set_cpu_guarantee_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_GUARANTEE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_GUARANTEE_ISSET_ID, value);
   }
 
   public double get_memory_guarantee_remaining() {
@@ -508,16 +508,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_memory_guarantee_remaining() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEMORY_GUARANTEE_REMAINING_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEMORY_GUARANTEE_REMAINING_ISSET_ID);
   }
 
   /** Returns true if field memory_guarantee_remaining is set (has been assigned a value) and false otherwise */
   public boolean is_set_memory_guarantee_remaining() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MEMORY_GUARANTEE_REMAINING_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __MEMORY_GUARANTEE_REMAINING_ISSET_ID);
   }
 
   public void set_memory_guarantee_remaining_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MEMORY_GUARANTEE_REMAINING_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MEMORY_GUARANTEE_REMAINING_ISSET_ID, value);
   }
 
   public double get_cpu_guarantee_remaining() {
@@ -530,16 +530,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_cpu_guarantee_remaining() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_GUARANTEE_REMAINING_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_GUARANTEE_REMAINING_ISSET_ID);
   }
 
   /** Returns true if field cpu_guarantee_remaining is set (has been assigned a value) and false otherwise */
   public boolean is_set_cpu_guarantee_remaining() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_GUARANTEE_REMAINING_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_GUARANTEE_REMAINING_ISSET_ID);
   }
 
   public void set_cpu_guarantee_remaining_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_GUARANTEE_REMAINING_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_GUARANTEE_REMAINING_ISSET_ID, value);
   }
 
   public int get_isolated_node_guarantee() {
@@ -552,16 +552,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_isolated_node_guarantee() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISOLATED_NODE_GUARANTEE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISOLATED_NODE_GUARANTEE_ISSET_ID);
   }
 
   /** Returns true if field isolated_node_guarantee is set (has been assigned a value) and false otherwise */
   public boolean is_set_isolated_node_guarantee() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISOLATED_NODE_GUARANTEE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ISOLATED_NODE_GUARANTEE_ISSET_ID);
   }
 
   public void set_isolated_node_guarantee_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISOLATED_NODE_GUARANTEE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ISOLATED_NODE_GUARANTEE_ISSET_ID, value);
   }
 
   public int get_total_tasks() {
@@ -574,16 +574,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_total_tasks() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_TASKS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_TASKS_ISSET_ID);
   }
 
   /** Returns true if field total_tasks is set (has been assigned a value) and false otherwise */
   public boolean is_set_total_tasks() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_TASKS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_TASKS_ISSET_ID);
   }
 
   public void set_total_tasks_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_TASKS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_TASKS_ISSET_ID, value);
   }
 
   public double get_requested_on_heap_memory() {
@@ -596,16 +596,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_requested_on_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_ON_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_on_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_on_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_ON_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_requested_on_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_ON_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_ON_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_requested_off_heap_memory() {
@@ -618,16 +618,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_requested_off_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_OFF_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_off_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_off_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_OFF_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_requested_off_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_OFF_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_OFF_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_requested_total_memory() {
@@ -640,16 +640,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_requested_total_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_TOTAL_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_TOTAL_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_total_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_total_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_TOTAL_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_TOTAL_MEMORY_ISSET_ID);
   }
 
   public void set_requested_total_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_TOTAL_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_TOTAL_MEMORY_ISSET_ID, value);
   }
 
   public double get_requested_cpu() {
@@ -662,16 +662,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_requested_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   public void set_requested_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
   }
 
   public double get_assigned_on_heap_memory() {
@@ -684,16 +684,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_assigned_on_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_ON_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field assigned_on_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_on_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_ON_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_assigned_on_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_ON_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_ON_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_assigned_off_heap_memory() {
@@ -706,16 +706,16 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
   }
 
   public void unset_assigned_off_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field assigned_off_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_off_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_assigned_off_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_OFF_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -1176,27 +1176,27 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
 
     hashCode = hashCode * 8191 + ((is_set_memory_usage()) ? 131071 : 524287);
     if (is_set_memory_usage())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(memory_usage);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(memory_usage);
 
     hashCode = hashCode * 8191 + ((is_set_cpu_usage()) ? 131071 : 524287);
     if (is_set_cpu_usage())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(cpu_usage);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(cpu_usage);
 
     hashCode = hashCode * 8191 + ((is_set_memory_guarantee()) ? 131071 : 524287);
     if (is_set_memory_guarantee())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(memory_guarantee);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(memory_guarantee);
 
     hashCode = hashCode * 8191 + ((is_set_cpu_guarantee()) ? 131071 : 524287);
     if (is_set_cpu_guarantee())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(cpu_guarantee);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(cpu_guarantee);
 
     hashCode = hashCode * 8191 + ((is_set_memory_guarantee_remaining()) ? 131071 : 524287);
     if (is_set_memory_guarantee_remaining())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(memory_guarantee_remaining);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(memory_guarantee_remaining);
 
     hashCode = hashCode * 8191 + ((is_set_cpu_guarantee_remaining()) ? 131071 : 524287);
     if (is_set_cpu_guarantee_remaining())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(cpu_guarantee_remaining);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(cpu_guarantee_remaining);
 
     hashCode = hashCode * 8191 + ((is_set_isolated_node_guarantee()) ? 131071 : 524287);
     if (is_set_isolated_node_guarantee())
@@ -1208,27 +1208,27 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
 
     hashCode = hashCode * 8191 + ((is_set_requested_on_heap_memory()) ? 131071 : 524287);
     if (is_set_requested_on_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_on_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_on_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_requested_off_heap_memory()) ? 131071 : 524287);
     if (is_set_requested_off_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_off_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_off_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_requested_total_memory()) ? 131071 : 524287);
     if (is_set_requested_total_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_total_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_total_memory);
 
     hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287);
     if (is_set_requested_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_on_heap_memory()) ? 131071 : 524287);
     if (is_set_assigned_on_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_on_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_on_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_off_heap_memory()) ? 131071 : 524287);
     if (is_set_assigned_off_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_off_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_off_heap_memory);
 
     return hashCode;
   }
@@ -1246,7 +1246,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1256,7 +1256,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_total_topologies()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_topologies, other.total_topologies);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_topologies, other.total_topologies);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1266,7 +1266,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_total_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_executors, other.total_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_executors, other.total_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1276,7 +1276,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_total_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_workers, other.total_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_workers, other.total_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1286,7 +1286,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_memory_usage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memory_usage, other.memory_usage);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.memory_usage, other.memory_usage);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1296,7 +1296,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_cpu_usage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpu_usage, other.cpu_usage);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.cpu_usage, other.cpu_usage);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1306,7 +1306,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_memory_guarantee()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memory_guarantee, other.memory_guarantee);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.memory_guarantee, other.memory_guarantee);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1316,7 +1316,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_cpu_guarantee()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpu_guarantee, other.cpu_guarantee);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.cpu_guarantee, other.cpu_guarantee);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1326,7 +1326,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_memory_guarantee_remaining()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memory_guarantee_remaining, other.memory_guarantee_remaining);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.memory_guarantee_remaining, other.memory_guarantee_remaining);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1336,7 +1336,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_cpu_guarantee_remaining()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpu_guarantee_remaining, other.cpu_guarantee_remaining);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.cpu_guarantee_remaining, other.cpu_guarantee_remaining);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1346,7 +1346,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_isolated_node_guarantee()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isolated_node_guarantee, other.isolated_node_guarantee);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.isolated_node_guarantee, other.isolated_node_guarantee);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1356,7 +1356,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_total_tasks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_tasks, other.total_tasks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_tasks, other.total_tasks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1366,7 +1366,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_requested_on_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_on_heap_memory, other.requested_on_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_on_heap_memory, other.requested_on_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1376,7 +1376,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_requested_off_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_off_heap_memory, other.requested_off_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_off_heap_memory, other.requested_off_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1386,7 +1386,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_requested_total_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_total_memory, other.requested_total_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_total_memory, other.requested_total_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1396,7 +1396,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_requested_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1406,7 +1406,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_assigned_on_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_on_heap_memory, other.assigned_on_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_on_heap_memory, other.assigned_on_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1416,7 +1416,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       return lastComparison;
     }
     if (is_set_assigned_off_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_off_heap_memory, other.assigned_off_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_off_heap_memory, other.assigned_off_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1428,11 +1428,11 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
     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);
   }
 
@@ -1554,10 +1554,10 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
     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_owner()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'owner' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'owner' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1565,8 +1565,8 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
 
   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);
     }
   }
@@ -1575,176 +1575,176 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
     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 OwnerResourceSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class OwnerResourceSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public OwnerResourceSummaryStandardScheme getScheme() {
       return new OwnerResourceSummaryStandardScheme();
     }
   }
 
-  private static class OwnerResourceSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<OwnerResourceSummary> {
+  private static class OwnerResourceSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<OwnerResourceSummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, OwnerResourceSummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, OwnerResourceSummary 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: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_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: // TOTAL_TOPOLOGIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.total_topologies = iprot.readI32();
               struct.set_total_topologies_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: // TOTAL_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.total_executors = iprot.readI32();
               struct.set_total_executors_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: // TOTAL_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.total_workers = iprot.readI32();
               struct.set_total_workers_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: // MEMORY_USAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.memory_usage = iprot.readDouble();
               struct.set_memory_usage_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: // CPU_USAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.cpu_usage = iprot.readDouble();
               struct.set_cpu_usage_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: // MEMORY_GUARANTEE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.memory_guarantee = iprot.readDouble();
               struct.set_memory_guarantee_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: // CPU_GUARANTEE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.cpu_guarantee = iprot.readDouble();
               struct.set_cpu_guarantee_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: // MEMORY_GUARANTEE_REMAINING
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.memory_guarantee_remaining = iprot.readDouble();
               struct.set_memory_guarantee_remaining_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: // CPU_GUARANTEE_REMAINING
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.cpu_guarantee_remaining = iprot.readDouble();
               struct.set_cpu_guarantee_remaining_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 11: // ISOLATED_NODE_GUARANTEE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.isolated_node_guarantee = iprot.readI32();
               struct.set_isolated_node_guarantee_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 12: // TOTAL_TASKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.total_tasks = iprot.readI32();
               struct.set_total_tasks_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 13: // REQUESTED_ON_HEAP_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_on_heap_memory = iprot.readDouble();
               struct.set_requested_on_heap_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 14: // REQUESTED_OFF_HEAP_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_off_heap_memory = iprot.readDouble();
               struct.set_requested_off_heap_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 15: // REQUESTED_TOTAL_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_total_memory = iprot.readDouble();
               struct.set_requested_total_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 16: // REQUESTED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_cpu = iprot.readDouble();
               struct.set_requested_cpu_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 17: // ASSIGNED_ON_HEAP_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_on_heap_memory = iprot.readDouble();
               struct.set_assigned_on_heap_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 18: // ASSIGNED_OFF_HEAP_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_off_heap_memory = iprot.readDouble();
               struct.set_assigned_off_heap_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();
       }
@@ -1752,7 +1752,7 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, OwnerResourceSummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, OwnerResourceSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1852,17 +1852,17 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
 
   }
 
-  private static class OwnerResourceSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class OwnerResourceSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public OwnerResourceSummaryTupleScheme getScheme() {
       return new OwnerResourceSummaryTupleScheme();
     }
   }
 
-  private static class OwnerResourceSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<OwnerResourceSummary> {
+  private static class OwnerResourceSummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<OwnerResourceSummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, OwnerResourceSummary 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, OwnerResourceSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.owner);
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_total_topologies()) {
@@ -1971,8 +1971,8 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, OwnerResourceSummary 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, OwnerResourceSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.owner = iprot.readString();
       struct.set_owner_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(17);
@@ -2047,8 +2047,8 @@ public class OwnerResourceSummary implements org.apache.thrift.TBase<OwnerResour
     }
   }
 
-  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();
   }
 }
 


[46/50] [abbrv] storm git commit: STORM-2882: commons-codec httpclient

Posted by bo...@apache.org.
STORM-2882: commons-codec httpclient


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8fa27438
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8fa27438
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8fa27438

Branch: refs/heads/master
Commit: 8fa274388e5b5644543f409e7cddcadca4a3ff33
Parents: 1b9e81f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 30 13:23:42 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 shaded-deps/pom.xml                                 | 16 ++++++++++++++--
 .../org/apache/storm/messaging/netty/SaslUtils.java |  2 +-
 .../apache/storm/security/auth/ClientAuthUtils.java |  2 +-
 .../serialization/BlowfishTupleSerializer.java      |  5 +++--
 .../storm/security/auth/ClientAuthUtilsTest.java    |  2 +-
 storm-server/pom.xml                                |  4 ++++
 6 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/8fa27438/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 9cbe139..1fccb60 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -108,7 +108,6 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <scope>compile</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -122,8 +121,16 @@
                     <groupId>javax.servlet</groupId>
                     <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -148,17 +155,18 @@
                         <includes>
                             <include>com.google.guava:guava</include>
                             <include>com.googlecode.json-simple:json-simple</include>
+                            <include>commons-codec:commons-codec</include>
                             <include>commons-collections:commons-collections</include>
                             <include>commons-io:commons-io</include>
                             <include>commons-lang:commons-lang</include>
                             <include>io.netty:netty</include>
                             <include>org.apache.curator:*</include>
+                            <include>org.apache.httpcomponents:httpclient</include>
                             <include>org.apache.thrift:*</include>
                             <include>org.apache.zookeeper:zookeeper</include>
                             <include>org.jctools:jctools-core</include>
                             <include>org.jgrapht:jgrapht-core</include>
                             <include>org.yaml:snakeyaml</include>
-
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -220,6 +228,10 @@
                             <pattern>org.jgrapht</pattern>
                             <shadedPattern>org.apache.storm.shade.org.jgrapht</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.codec</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.apache.commons.codec</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

http://git-wip-us.apache.org/repos/asf/storm/blob/8fa27438/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
index 7efd1b1..7a7e2e8 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
@@ -16,9 +16,9 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import javax.security.sasl.Sasl;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.storm.Config;
 import org.apache.storm.shade.com.google.common.base.Charsets;
+import org.apache.storm.shade.org.apache.commons.codec.binary.Base64;
 
 class SaslUtils {
     public static final String KERBEROS = "GSSAPI";

http://git-wip-us.apache.org/repos/asf/storm/blob/8fa27438/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java b/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
index 4f8fac8..f2e2f6b 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
@@ -37,12 +37,12 @@ import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosTicket;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.storm.Config;
 import org.apache.storm.generated.WorkerToken;
 import org.apache.storm.generated.WorkerTokenInfo;
 import org.apache.storm.generated.WorkerTokenServiceType;
 import org.apache.storm.security.INimbusCredentialPlugin;
+import org.apache.storm.shade.org.apache.commons.codec.binary.Hex;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ReflectionUtils;
 import org.apache.storm.utils.Utils;

http://git-wip-us.apache.org/repos/asf/storm/blob/8fa27438/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java b/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
index 20579cd..4c4d4d2 100644
--- a/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
@@ -20,9 +20,10 @@ import com.esotericsoftware.kryo.serializers.BlowfishSerializer;
 import java.util.Map;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.storm.Config;
 import org.apache.storm.serialization.types.ListDelegateSerializer;
+import org.apache.storm.shade.org.apache.commons.codec.DecoderException;
+import org.apache.storm.shade.org.apache.commons.codec.binary.Hex;
 import org.apache.storm.utils.ListDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,7 +65,7 @@ public class BlowfishTupleSerializer extends Serializer<ListDelegate> {
                 }
             }
             serializer = new BlowfishSerializer(new ListDelegateSerializer(), bytes);
-        } catch (org.apache.commons.codec.DecoderException ex) {
+        } catch (DecoderException ex) {
             throw new RuntimeException("Blowfish encryption key invalid", ex);
         }
     }

http://git-wip-us.apache.org/repos/asf/storm/blob/8fa27438/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
index e7a9aca..dbbba14 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
@@ -30,8 +30,8 @@ import java.util.Map;
 import javax.security.auth.Subject;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.storm.Config;
+import org.apache.storm.shade.org.apache.commons.codec.binary.Hex;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/storm/blob/8fa27438/storm-server/pom.xml
----------------------------------------------------------------------
diff --git a/storm-server/pom.xml b/storm-server/pom.xml
index 662a8d3..0d9501a 100644
--- a/storm-server/pom.xml
+++ b/storm-server/pom.xml
@@ -111,6 +111,10 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
     </dependencies>
 
     <build>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
index 2f2dd78..6bff674 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LSTopoHistory._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistory> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSTopoHistory");
+public class LSTopoHistory implements org.apache.storm.thrift.TBase<LSTopoHistory, LSTopoHistory._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistory> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSTopoHistory");
 
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TIME_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("time_stamp", org.apache.thrift.protocol.TType.I64, (short)2);
-  private static final org.apache.thrift.protocol.TField USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("users", org.apache.thrift.protocol.TType.LIST, (short)3);
-  private static final org.apache.thrift.protocol.TField GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("groups", org.apache.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TIME_STAMP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_stamp", org.apache.storm.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField USERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("users", org.apache.storm.thrift.protocol.TType.LIST, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField GROUPS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("groups", org.apache.storm.thrift.protocol.TType.LIST, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSTopoHistoryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSTopoHistoryTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSTopoHistoryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSTopoHistoryTupleSchemeFactory();
 
   private java.lang.String topology_id; // required
   private long time_stamp; // required
@@ -42,7 +42,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
   private java.util.List<java.lang.String> groups; // 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 {
     TOPOLOGY_ID((short)1, "topology_id"),
     TIME_STAMP((short)2, "time_stamp"),
     USERS((short)3, "users"),
@@ -111,21 +111,21 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
   // isset id assignments
   private static final int __TIME_STAMP_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.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TIME_STAMP, new org.apache.thrift.meta_data.FieldMetaData("time_stamp", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.USERS, new org.apache.thrift.meta_data.FieldMetaData("users", 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.GROUPS, new org.apache.thrift.meta_data.FieldMetaData("groups", 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))));
+    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.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TIME_STAMP, new org.apache.storm.thrift.meta_data.FieldMetaData("time_stamp", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.USERS, new org.apache.storm.thrift.meta_data.FieldMetaData("users", 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.GROUPS, new org.apache.storm.thrift.meta_data.FieldMetaData("groups", 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))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSTopoHistory.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSTopoHistory.class, metaDataMap);
   }
 
   public LSTopoHistory() {
@@ -210,16 +210,16 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
   }
 
   public void unset_time_stamp() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
   }
 
   /** Returns true if field time_stamp is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_stamp() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_STAMP_ISSET_ID);
   }
 
   public void set_time_stamp_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_STAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_STAMP_ISSET_ID, value);
   }
 
   public int get_users_size() {
@@ -434,7 +434,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
     if (is_set_topology_id())
       hashCode = hashCode * 8191 + topology_id.hashCode();
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(time_stamp);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(time_stamp);
 
     hashCode = hashCode * 8191 + ((is_set_users()) ? 131071 : 524287);
     if (is_set_users())
@@ -460,7 +460,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       return lastComparison;
     }
     if (is_set_topology_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -470,7 +470,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       return lastComparison;
     }
     if (is_set_time_stamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_stamp, other.time_stamp);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_stamp, other.time_stamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -480,7 +480,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       return lastComparison;
     }
     if (is_set_users()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.users, other.users);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.users, other.users);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -490,7 +490,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       return lastComparison;
     }
     if (is_set_groups()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groups, other.groups);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.groups, other.groups);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -502,11 +502,11 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
     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);
   }
 
@@ -546,22 +546,22 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
     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_topology_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_time_stamp()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_stamp' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'time_stamp' is unset! Struct:" + toString());
     }
 
     if (!is_set_users()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'users' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'users' is unset! Struct:" + toString());
     }
 
     if (!is_set_groups()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'groups' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'groups' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -569,8 +569,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
 
   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);
     }
   }
@@ -579,50 +579,50 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
     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 LSTopoHistoryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSTopoHistoryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSTopoHistoryStandardScheme getScheme() {
       return new LSTopoHistoryStandardScheme();
     }
   }
 
-  private static class LSTopoHistoryStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSTopoHistory> {
+  private static class LSTopoHistoryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSTopoHistory> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LSTopoHistory struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSTopoHistory 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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_id = iprot.readString();
               struct.set_topology_id_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: // TIME_STAMP
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.time_stamp = iprot.readI64();
               struct.set_time_stamp_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: // USERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list828 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list828 = iprot.readListBegin();
                 struct.users = new java.util.ArrayList<java.lang.String>(_list828.size);
                 java.lang.String _elem829;
                 for (int _i830 = 0; _i830 < _list828.size; ++_i830)
@@ -634,13 +634,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
               }
               struct.set_users_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: // GROUPS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list831 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list831 = iprot.readListBegin();
                 struct.groups = new java.util.ArrayList<java.lang.String>(_list831.size);
                 java.lang.String _elem832;
                 for (int _i833 = 0; _i833 < _list831.size; ++_i833)
@@ -652,11 +652,11 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
               }
               struct.set_groups_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();
       }
@@ -664,7 +664,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LSTopoHistory struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSTopoHistory struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -679,7 +679,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       if (struct.users != null) {
         oprot.writeFieldBegin(USERS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.users.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.users.size()));
           for (java.lang.String _iter834 : struct.users)
           {
             oprot.writeString(_iter834);
@@ -691,7 +691,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       if (struct.groups != null) {
         oprot.writeFieldBegin(GROUPS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.groups.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.groups.size()));
           for (java.lang.String _iter835 : struct.groups)
           {
             oprot.writeString(_iter835);
@@ -706,17 +706,17 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
 
   }
 
-  private static class LSTopoHistoryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSTopoHistoryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSTopoHistoryTupleScheme getScheme() {
       return new LSTopoHistoryTupleScheme();
     }
   }
 
-  private static class LSTopoHistoryTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSTopoHistory> {
+  private static class LSTopoHistoryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LSTopoHistory> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LSTopoHistory 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, LSTopoHistory struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.topology_id);
       oprot.writeI64(struct.time_stamp);
       {
@@ -736,14 +736,14 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LSTopoHistory 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, LSTopoHistory struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       struct.time_stamp = iprot.readI64();
       struct.set_time_stamp_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list838 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list838 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
         struct.users = new java.util.ArrayList<java.lang.String>(_list838.size);
         java.lang.String _elem839;
         for (int _i840 = 0; _i840 < _list838.size; ++_i840)
@@ -754,7 +754,7 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
       }
       struct.set_users_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list841 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list841 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
         struct.groups = new java.util.ArrayList<java.lang.String>(_list841.size);
         java.lang.String _elem842;
         for (int _i843 = 0; _i843 < _list841.size; ++_i843)
@@ -767,8 +767,8 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST
     }
   }
 
-  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/LSTopoHistoryList.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java
index aca3029..74d62a8 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryList, LSTopoHistoryList._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistoryList> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSTopoHistoryList");
+public class LSTopoHistoryList implements org.apache.storm.thrift.TBase<LSTopoHistoryList, LSTopoHistoryList._Fields>, java.io.Serializable, Cloneable, Comparable<LSTopoHistoryList> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSTopoHistoryList");
 
-  private static final org.apache.thrift.protocol.TField TOPO_HISTORY_FIELD_DESC = new org.apache.thrift.protocol.TField("topo_history", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TOPO_HISTORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topo_history", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSTopoHistoryListStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSTopoHistoryListTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSTopoHistoryListStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSTopoHistoryListTupleSchemeFactory();
 
   private java.util.List<LSTopoHistory> topo_history; // 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 {
     TOPO_HISTORY((short)1, "topo_history");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,14 +94,14 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
   }
 
   // isset id assignments
-  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.TOPO_HISTORY, new org.apache.thrift.meta_data.FieldMetaData("topo_history", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, LSTopoHistory.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.TOPO_HISTORY, new org.apache.storm.thrift.meta_data.FieldMetaData("topo_history", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, LSTopoHistory.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSTopoHistoryList.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSTopoHistoryList.class, metaDataMap);
   }
 
   public LSTopoHistoryList() {
@@ -260,7 +260,7 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
       return lastComparison;
     }
     if (is_set_topo_history()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topo_history, other.topo_history);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topo_history, other.topo_history);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -272,11 +272,11 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
     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);
   }
 
@@ -296,10 +296,10 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
     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_topo_history()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topo_history' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topo_history' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -307,42 +307,42 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
 
   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 LSTopoHistoryListStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSTopoHistoryListStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSTopoHistoryListStandardScheme getScheme() {
       return new LSTopoHistoryListStandardScheme();
     }
   }
 
-  private static class LSTopoHistoryListStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSTopoHistoryList> {
+  private static class LSTopoHistoryListStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSTopoHistoryList> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LSTopoHistoryList struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSTopoHistoryList 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: // TOPO_HISTORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list844 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list844 = iprot.readListBegin();
                 struct.topo_history = new java.util.ArrayList<LSTopoHistory>(_list844.size);
                 LSTopoHistory _elem845;
                 for (int _i846 = 0; _i846 < _list844.size; ++_i846)
@@ -355,11 +355,11 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
               }
               struct.set_topo_history_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();
       }
@@ -367,14 +367,14 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LSTopoHistoryList struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSTopoHistoryList struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.topo_history != null) {
         oprot.writeFieldBegin(TOPO_HISTORY_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.topo_history.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.topo_history.size()));
           for (LSTopoHistory _iter847 : struct.topo_history)
           {
             _iter847.write(oprot);
@@ -389,17 +389,17 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
 
   }
 
-  private static class LSTopoHistoryListTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSTopoHistoryListTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSTopoHistoryListTupleScheme getScheme() {
       return new LSTopoHistoryListTupleScheme();
     }
   }
 
-  private static class LSTopoHistoryListTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSTopoHistoryList> {
+  private static class LSTopoHistoryListTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LSTopoHistoryList> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LSTopoHistoryList 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, LSTopoHistoryList struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.topo_history.size());
         for (LSTopoHistory _iter848 : struct.topo_history)
@@ -410,10 +410,10 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LSTopoHistoryList 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, LSTopoHistoryList 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 _list849 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list849 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.topo_history = new java.util.ArrayList<LSTopoHistory>(_list849.size);
         LSTopoHistory _elem850;
         for (int _i851 = 0; _i851 < _list849.size; ++_i851)
@@ -427,8 +427,8 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL
     }
   }
 
-  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/LSWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java
index 7f108ee..836c222 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSWorkerHeartbeat");
+public class LSWorkerHeartbeat implements org.apache.storm.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LSWorkerHeartbeat");
 
-  private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)3);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_secs", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_id", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executors", org.apache.storm.thrift.protocol.TType.LIST, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.I32, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSWorkerHeartbeatStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSWorkerHeartbeatTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LSWorkerHeartbeatStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LSWorkerHeartbeatTupleSchemeFactory();
 
   private int time_secs; // required
   private java.lang.String topology_id; // required
@@ -42,7 +42,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
   private int port; // 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 {
     TIME_SECS((short)1, "time_secs"),
     TOPOLOGY_ID((short)2, "topology_id"),
     EXECUTORS((short)3, "executors"),
@@ -112,20 +112,20 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
   private static final int __TIME_SECS_ISSET_ID = 0;
   private static final int __PORT_ISSET_ID = 1;
   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.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, ExecutorInfo.class))));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("time_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("executors", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorInfo.class))));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSWorkerHeartbeat.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSWorkerHeartbeat.class, metaDataMap);
   }
 
   public LSWorkerHeartbeat() {
@@ -189,16 +189,16 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
   }
 
   public void unset_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   public void set_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_topology_id() {
@@ -272,16 +272,16 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
   }
 
   public void unset_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -444,7 +444,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       return lastComparison;
     }
     if (is_set_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -454,7 +454,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       return lastComparison;
     }
     if (is_set_topology_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -464,7 +464,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       return lastComparison;
     }
     if (is_set_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executors, other.executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -474,7 +474,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -486,11 +486,11 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
     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);
   }
 
@@ -526,22 +526,22 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
     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_time_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_topology_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_executors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
     }
 
     if (!is_set_port()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -549,8 +549,8 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
 
   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);
     }
   }
@@ -559,50 +559,50 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
     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 LSWorkerHeartbeatStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSWorkerHeartbeatStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSWorkerHeartbeatStandardScheme getScheme() {
       return new LSWorkerHeartbeatStandardScheme();
     }
   }
 
-  private static class LSWorkerHeartbeatStandardScheme extends org.apache.thrift.scheme.StandardScheme<LSWorkerHeartbeat> {
+  private static class LSWorkerHeartbeatStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LSWorkerHeartbeat> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LSWorkerHeartbeat struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LSWorkerHeartbeat 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: // TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.time_secs = iprot.readI32();
               struct.set_time_secs_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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_id = iprot.readString();
               struct.set_topology_id_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: // EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list820 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list820 = iprot.readListBegin();
                 struct.executors = new java.util.ArrayList<ExecutorInfo>(_list820.size);
                 ExecutorInfo _elem821;
                 for (int _i822 = 0; _i822 < _list820.size; ++_i822)
@@ -615,19 +615,19 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
               }
               struct.set_executors_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.port = iprot.readI32();
               struct.set_port_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();
       }
@@ -635,7 +635,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LSWorkerHeartbeat struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LSWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -650,7 +650,7 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
       if (struct.executors != null) {
         oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.executors.size()));
           for (ExecutorInfo _iter823 : struct.executors)
           {
             _iter823.write(oprot);
@@ -668,17 +668,17 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
 
   }
 
-  private static class LSWorkerHeartbeatTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LSWorkerHeartbeatTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LSWorkerHeartbeatTupleScheme getScheme() {
       return new LSWorkerHeartbeatTupleScheme();
     }
   }
 
-  private static class LSWorkerHeartbeatTupleScheme extends org.apache.thrift.scheme.TupleScheme<LSWorkerHeartbeat> {
+  private static class LSWorkerHeartbeatTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LSWorkerHeartbeat> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat 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, LSWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI32(struct.time_secs);
       oprot.writeString(struct.topology_id);
       {
@@ -692,14 +692,14 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat 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, LSWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.time_secs = iprot.readI32();
       struct.set_time_secs_isSet(true);
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list825 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list825 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.executors = new java.util.ArrayList<ExecutorInfo>(_list825.size);
         ExecutorInfo _elem826;
         for (int _i827 = 0; _i827 < _list825.size; ++_i827)
@@ -715,8 +715,8 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb
     }
   }
 
-  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/ListBlobsResult.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java b/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java
index d27f0f1..130b31b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ListBlobsResult.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 ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult, ListBlobsResult._Fields>, java.io.Serializable, Cloneable, Comparable<ListBlobsResult> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ListBlobsResult");
+public class ListBlobsResult implements org.apache.storm.thrift.TBase<ListBlobsResult, ListBlobsResult._Fields>, java.io.Serializable, Cloneable, Comparable<ListBlobsResult> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ListBlobsResult");
 
-  private static final org.apache.thrift.protocol.TField KEYS_FIELD_DESC = new org.apache.thrift.protocol.TField("keys", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("session", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField KEYS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("keys", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("session", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ListBlobsResultStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ListBlobsResultTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ListBlobsResultStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ListBlobsResultTupleSchemeFactory();
 
   private java.util.List<java.lang.String> keys; // required
   private java.lang.String session; // 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 {
     KEYS((short)1, "keys"),
     SESSION((short)2, "session");
 
@@ -99,16 +99,16 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
   }
 
   // isset id assignments
-  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.KEYS, new org.apache.thrift.meta_data.FieldMetaData("keys", 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.SESSION, new org.apache.thrift.meta_data.FieldMetaData("session", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.KEYS, new org.apache.storm.thrift.meta_data.FieldMetaData("keys", 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.SESSION, new org.apache.storm.thrift.meta_data.FieldMetaData("session", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ListBlobsResult.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ListBlobsResult.class, metaDataMap);
   }
 
   public ListBlobsResult() {
@@ -319,7 +319,7 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
       return lastComparison;
     }
     if (is_set_keys()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keys, other.keys);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.keys, other.keys);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -329,7 +329,7 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
       return lastComparison;
     }
     if (is_set_session()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, other.session);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.session, other.session);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -341,11 +341,11 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
     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);
   }
 
@@ -373,14 +373,14 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
     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_keys()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'keys' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'keys' is unset! Struct:" + toString());
     }
 
     if (!is_set_session()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'session' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'session' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -388,42 +388,42 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
 
   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 ListBlobsResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ListBlobsResultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ListBlobsResultStandardScheme getScheme() {
       return new ListBlobsResultStandardScheme();
     }
   }
 
-  private static class ListBlobsResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<ListBlobsResult> {
+  private static class ListBlobsResultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ListBlobsResult> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ListBlobsResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ListBlobsResult 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: // KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list614 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list614 = iprot.readListBegin();
                 struct.keys = new java.util.ArrayList<java.lang.String>(_list614.size);
                 java.lang.String _elem615;
                 for (int _i616 = 0; _i616 < _list614.size; ++_i616)
@@ -435,19 +435,19 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
               }
               struct.set_keys_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: // SESSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.session = iprot.readString();
               struct.set_session_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();
       }
@@ -455,14 +455,14 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ListBlobsResult struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ListBlobsResult struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.keys != null) {
         oprot.writeFieldBegin(KEYS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.keys.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.keys.size()));
           for (java.lang.String _iter617 : struct.keys)
           {
             oprot.writeString(_iter617);
@@ -482,17 +482,17 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
 
   }
 
-  private static class ListBlobsResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ListBlobsResultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ListBlobsResultTupleScheme getScheme() {
       return new ListBlobsResultTupleScheme();
     }
   }
 
-  private static class ListBlobsResultTupleScheme extends org.apache.thrift.scheme.TupleScheme<ListBlobsResult> {
+  private static class ListBlobsResultTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ListBlobsResult> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ListBlobsResult 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, ListBlobsResult struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.keys.size());
         for (java.lang.String _iter618 : struct.keys)
@@ -504,10 +504,10 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ListBlobsResult 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, ListBlobsResult 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 _list619 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list619 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
         struct.keys = new java.util.ArrayList<java.lang.String>(_list619.size);
         java.lang.String _elem620;
         for (int _i621 = 0; _i621 < _list619.size; ++_i621)
@@ -522,8 +522,8 @@ public class ListBlobsResult implements org.apache.thrift.TBase<ListBlobsResult,
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
index cca97b6..8b8bc2d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorStats.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats");
+public class ExecutorStats implements org.apache.storm.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorStats");
 
-  private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.MAP, (short)1);
-  private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField SPECIFIC_FIELD_DESC = new org.apache.thrift.protocol.TField("specific", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("rate", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("emitted", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("transferred", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SPECIFIC_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("specific", org.apache.storm.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField RATE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("rate", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorStatsTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>> emitted; // required
   private java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>> transferred; // required
@@ -42,7 +42,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
   private double rate; // 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 {
     EMITTED((short)1, "emitted"),
     TRANSFERRED((short)2, "transferred"),
     SPECIFIC((short)3, "specific"),
@@ -111,27 +111,27 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
   // isset id assignments
   private static final int __RATE_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.EMITTED, new org.apache.thrift.meta_data.FieldMetaData("emitted", 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.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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.TRANSFERRED, new org.apache.thrift.meta_data.FieldMetaData("transferred", 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.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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.SPECIFIC, new org.apache.thrift.meta_data.FieldMetaData("specific", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorSpecificStats.class)));
-    tmpMap.put(_Fields.RATE, new org.apache.thrift.meta_data.FieldMetaData("rate", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.EMITTED, new org.apache.storm.thrift.meta_data.FieldMetaData("emitted", 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.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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.TRANSFERRED, new org.apache.storm.thrift.meta_data.FieldMetaData("transferred", 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.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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.SPECIFIC, new org.apache.storm.thrift.meta_data.FieldMetaData("specific", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorSpecificStats.class)));
+    tmpMap.put(_Fields.RATE, new org.apache.storm.thrift.meta_data.FieldMetaData("rate", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorStats.class, metaDataMap);
   }
 
   public ExecutorStats() {
@@ -306,16 +306,16 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
   }
 
   public void unset_rate() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RATE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __RATE_ISSET_ID);
   }
 
   /** Returns true if field rate is set (has been assigned a value) and false otherwise */
   public boolean is_set_rate() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RATE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __RATE_ISSET_ID);
   }
 
   public void set_rate_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __RATE_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -462,7 +462,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     if (is_set_specific())
       hashCode = hashCode * 8191 + specific.hashCode();
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(rate);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(rate);
 
     return hashCode;
   }
@@ -480,7 +480,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       return lastComparison;
     }
     if (is_set_emitted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, other.emitted);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.emitted, other.emitted);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -490,7 +490,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       return lastComparison;
     }
     if (is_set_transferred()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, other.transferred);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.transferred, other.transferred);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -500,7 +500,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       return lastComparison;
     }
     if (is_set_specific()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific, other.specific);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.specific, other.specific);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -510,7 +510,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       return lastComparison;
     }
     if (is_set_rate()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rate, other.rate);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.rate, other.rate);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -522,11 +522,11 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     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);
   }
 
@@ -566,22 +566,22 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     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_emitted()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'emitted' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'emitted' is unset! Struct:" + toString());
     }
 
     if (!is_set_transferred()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'transferred' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'transferred' is unset! Struct:" + toString());
     }
 
     if (!is_set_specific()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'specific' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'specific' is unset! Struct:" + toString());
     }
 
     if (!is_set_rate()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'rate' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'rate' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -589,8 +589,8 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
 
   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);
     }
   }
@@ -599,34 +599,34 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     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 ExecutorStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorStatsStandardScheme getScheme() {
       return new ExecutorStatsStandardScheme();
     }
   }
 
-  private static class ExecutorStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExecutorStats> {
+  private static class ExecutorStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorStats 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: // EMITTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map320 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map320 = iprot.readMapBegin();
                 struct.emitted = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map320.size);
                 java.lang.String _key321;
                 java.util.Map<java.lang.String,java.lang.Long> _val322;
@@ -634,7 +634,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
                 {
                   _key321 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map324 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map324 = iprot.readMapBegin();
                     _val322 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map324.size);
                     java.lang.String _key325;
                     long _val326;
@@ -652,13 +652,13 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
               }
               struct.set_emitted_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: // TRANSFERRED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map328 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map328 = iprot.readMapBegin();
                 struct.transferred = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map328.size);
                 java.lang.String _key329;
                 java.util.Map<java.lang.String,java.lang.Long> _val330;
@@ -666,7 +666,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
                 {
                   _key329 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map332 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map332 = iprot.readMapBegin();
                     _val330 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map332.size);
                     java.lang.String _key333;
                     long _val334;
@@ -684,28 +684,28 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
               }
               struct.set_transferred_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: // SPECIFIC
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.specific = new ExecutorSpecificStats();
               struct.specific.read(iprot);
               struct.set_specific_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: // RATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.rate = iprot.readDouble();
               struct.set_rate_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();
       }
@@ -713,19 +713,19 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.emitted != null) {
         oprot.writeFieldBegin(EMITTED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.emitted.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.emitted.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Long>> _iter336 : struct.emitted.entrySet())
           {
             oprot.writeString(_iter336.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter336.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, _iter336.getValue().size()));
               for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter337 : _iter336.getValue().entrySet())
               {
                 oprot.writeString(_iter337.getKey());
@@ -741,12 +741,12 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       if (struct.transferred != null) {
         oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.transferred.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.transferred.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Long>> _iter338 : struct.transferred.entrySet())
           {
             oprot.writeString(_iter338.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter338.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, _iter338.getValue().size()));
               for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter339 : _iter338.getValue().entrySet())
               {
                 oprot.writeString(_iter339.getKey());
@@ -773,17 +773,17 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
 
   }
 
-  private static class ExecutorStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorStatsTupleScheme getScheme() {
       return new ExecutorStatsTupleScheme();
     }
   }
 
-  private static class ExecutorStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ExecutorStats> {
+  private static class ExecutorStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ExecutorStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorStats 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, ExecutorStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.emitted.size());
         for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.Long>> _iter340 : struct.emitted.entrySet())
@@ -819,10 +819,10 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats 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, ExecutorStats 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 _map344 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map344 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.emitted = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map344.size);
         java.lang.String _key345;
         java.util.Map<java.lang.String,java.lang.Long> _val346;
@@ -830,7 +830,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
         {
           _key345 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map348 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map348 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val346 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map348.size);
             java.lang.String _key349;
             long _val350;
@@ -846,7 +846,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       }
       struct.set_emitted_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map352 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map352 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.transferred = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.Long>>(2*_map352.size);
         java.lang.String _key353;
         java.util.Map<java.lang.String,java.lang.Long> _val354;
@@ -854,7 +854,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
         {
           _key353 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map356 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map356 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val354 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map356.size);
             java.lang.String _key357;
             long _val358;
@@ -877,8 +877,8 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     }
   }
 
-  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/ExecutorSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java
index e4fc2aa..79f09b1 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSummary.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorSummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSummary");
+public class ExecutorSummary implements org.apache.storm.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorSummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorSummary");
 
-  private static final org.apache.thrift.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_info", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("component_id", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.STRUCT, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executor_info", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_id", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("host", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("stats", org.apache.storm.thrift.protocol.TType.STRUCT, (short)7);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorSummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorSummaryTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorSummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorSummaryTupleSchemeFactory();
 
   private ExecutorInfo executor_info; // required
   private java.lang.String component_id; // required
@@ -46,7 +46,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   private ExecutorStats stats; // 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 {
     EXECUTOR_INFO((short)1, "executor_info"),
     COMPONENT_ID((short)2, "component_id"),
     HOST((short)3, "host"),
@@ -123,23 +123,23 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   private static final int __UPTIME_SECS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.STATS};
-  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.EXECUTOR_INFO, new org.apache.thrift.meta_data.FieldMetaData("executor_info", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorInfo.class)));
-    tmpMap.put(_Fields.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("component_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorStats.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.EXECUTOR_INFO, new org.apache.storm.thrift.meta_data.FieldMetaData("executor_info", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorInfo.class)));
+    tmpMap.put(_Fields.COMPONENT_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("component_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("host", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("stats", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorStats.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSummary.class, metaDataMap);
   }
 
   public ExecutorSummary() {
@@ -278,16 +278,16 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   }
 
   public void unset_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -300,16 +300,16 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public ExecutorStats get_stats() {
@@ -547,7 +547,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       return lastComparison;
     }
     if (is_set_executor_info()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_info, other.executor_info);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executor_info, other.executor_info);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -557,7 +557,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       return lastComparison;
     }
     if (is_set_component_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, other.component_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_id, other.component_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -567,7 +567,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       return lastComparison;
     }
     if (is_set_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -577,7 +577,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -587,7 +587,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -597,7 +597,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       return lastComparison;
     }
     if (is_set_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, other.stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.stats, other.stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -609,11 +609,11 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
     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);
   }
 
@@ -667,26 +667,26 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
     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_executor_info()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executor_info' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executor_info' is unset! Struct:" + toString());
     }
 
     if (!is_set_component_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'component_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'component_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_host()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
     }
 
     if (!is_set_port()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
     }
 
     if (!is_set_uptime_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -700,8 +700,8 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
 
   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);
     }
   }
@@ -710,82 +710,82 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
     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 ExecutorSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorSummaryStandardScheme getScheme() {
       return new ExecutorSummaryStandardScheme();
     }
   }
 
-  private static class ExecutorSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExecutorSummary> {
+  private static class ExecutorSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorSummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorSummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorSummary 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: // EXECUTOR_INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.executor_info = new ExecutorInfo();
               struct.executor_info.read(iprot);
               struct.set_executor_info_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: // COMPONENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.component_id = iprot.readString();
               struct.set_component_id_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: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.host = iprot.readString();
               struct.set_host_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.port = iprot.readI32();
               struct.set_port_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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: // STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.stats = new ExecutorStats();
               struct.stats.read(iprot);
               struct.set_stats_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();
       }
@@ -793,7 +793,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorSummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -831,17 +831,17 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
 
   }
 
-  private static class ExecutorSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorSummaryTupleScheme getScheme() {
       return new ExecutorSummaryTupleScheme();
     }
   }
 
-  private static class ExecutorSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<ExecutorSummary> {
+  private static class ExecutorSummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ExecutorSummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorSummary 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, ExecutorSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.executor_info.write(oprot);
       oprot.writeString(struct.component_id);
       oprot.writeString(struct.host);
@@ -858,8 +858,8 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorSummary 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, ExecutorSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.executor_info = new ExecutorInfo();
       struct.executor_info.read(iprot);
       struct.set_executor_info_isSet(true);
@@ -880,8 +880,8 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
     }
   }
 
-  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/GetInfoOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java b/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java
index 7b5fa23..b6bd10e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/GetInfoOptions.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, GetInfoOptions._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfoOptions> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetInfoOptions");
+public class GetInfoOptions implements org.apache.storm.thrift.TBase<GetInfoOptions, GetInfoOptions._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfoOptions> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("GetInfoOptions");
 
-  private static final org.apache.thrift.protocol.TField NUM_ERR_CHOICE_FIELD_DESC = new org.apache.thrift.protocol.TField("num_err_choice", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NUM_ERR_CHOICE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_err_choice", org.apache.storm.thrift.protocol.TType.I32, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GetInfoOptionsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GetInfoOptionsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GetInfoOptionsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GetInfoOptionsTupleSchemeFactory();
 
   private NumErrorsChoice num_err_choice; // 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 NumErrorsChoice
@@ -99,13 +99,13 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.NUM_ERR_CHOICE};
-  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.NUM_ERR_CHOICE, new org.apache.thrift.meta_data.FieldMetaData("num_err_choice", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, NumErrorsChoice.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.NUM_ERR_CHOICE, new org.apache.storm.thrift.meta_data.FieldMetaData("num_err_choice", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, NumErrorsChoice.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetInfoOptions.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetInfoOptions.class, metaDataMap);
   }
 
   public GetInfoOptions() {
@@ -246,7 +246,7 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
       return lastComparison;
     }
     if (is_set_num_err_choice()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_err_choice, other.num_err_choice);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_err_choice, other.num_err_choice);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -258,11 +258,11 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
     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);
   }
 
@@ -284,55 +284,55 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 GetInfoOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class GetInfoOptionsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public GetInfoOptionsStandardScheme getScheme() {
       return new GetInfoOptionsStandardScheme();
     }
   }
 
-  private static class GetInfoOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<GetInfoOptions> {
+  private static class GetInfoOptionsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<GetInfoOptions> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GetInfoOptions struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, GetInfoOptions 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: // NUM_ERR_CHOICE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_err_choice = org.apache.storm.generated.NumErrorsChoice.findByValue(iprot.readI32());
               struct.set_num_err_choice_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();
       }
@@ -340,7 +340,7 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GetInfoOptions struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, GetInfoOptions struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -357,17 +357,17 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
 
   }
 
-  private static class GetInfoOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class GetInfoOptionsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public GetInfoOptionsTupleScheme getScheme() {
       return new GetInfoOptionsTupleScheme();
     }
   }
 
-  private static class GetInfoOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<GetInfoOptions> {
+  private static class GetInfoOptionsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<GetInfoOptions> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GetInfoOptions 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, GetInfoOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_num_err_choice()) {
         optionals.set(0);
@@ -379,8 +379,8 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GetInfoOptions 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, GetInfoOptions struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.num_err_choice = org.apache.storm.generated.NumErrorsChoice.findByValue(iprot.readI32());
@@ -389,8 +389,8 @@ public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, G
     }
   }
 
-  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/GlobalStreamId.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java b/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java
index 6911fec..6b3cfd5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/GlobalStreamId.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 GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId");
+public class GlobalStreamId implements org.apache.storm.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("GlobalStreamId");
 
-  private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("componentId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("streamId", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("componentId", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("streamId", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GlobalStreamIdStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GlobalStreamIdTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GlobalStreamIdStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GlobalStreamIdTupleSchemeFactory();
 
   private java.lang.String componentId; // required
   private java.lang.String streamId; // 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 {
     COMPONENT_ID((short)1, "componentId"),
     STREAM_ID((short)2, "streamId");
 
@@ -99,15 +99,15 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
   }
 
   // isset id assignments
-  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.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("componentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.STREAM_ID, new org.apache.thrift.meta_data.FieldMetaData("streamId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.COMPONENT_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("componentId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.STREAM_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("streamId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GlobalStreamId.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GlobalStreamId.class, metaDataMap);
   }
 
   public GlobalStreamId() {
@@ -302,7 +302,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
       return lastComparison;
     }
     if (is_set_componentId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, other.componentId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.componentId, other.componentId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
       return lastComparison;
     }
     if (is_set_streamId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, other.streamId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.streamId, other.streamId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
     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);
   }
 
@@ -356,14 +356,14 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
     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_componentId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString());
     }
 
     if (!is_set_streamId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -371,56 +371,56 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
 
   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 GlobalStreamIdStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class GlobalStreamIdStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public GlobalStreamIdStandardScheme getScheme() {
       return new GlobalStreamIdStandardScheme();
     }
   }
 
-  private static class GlobalStreamIdStandardScheme extends org.apache.thrift.scheme.StandardScheme<GlobalStreamId> {
+  private static class GlobalStreamIdStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<GlobalStreamId> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GlobalStreamId struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, GlobalStreamId 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: // COMPONENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.componentId = iprot.readString();
               struct.set_componentId_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: // STREAM_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.streamId = iprot.readString();
               struct.set_streamId_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();
       }
@@ -428,7 +428,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GlobalStreamId struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, GlobalStreamId struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -448,24 +448,24 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
 
   }
 
-  private static class GlobalStreamIdTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class GlobalStreamIdTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public GlobalStreamIdTupleScheme getScheme() {
       return new GlobalStreamIdTupleScheme();
     }
   }
 
-  private static class GlobalStreamIdTupleScheme extends org.apache.thrift.scheme.TupleScheme<GlobalStreamId> {
+  private static class GlobalStreamIdTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<GlobalStreamId> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId 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, GlobalStreamId struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.componentId);
       oprot.writeString(struct.streamId);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId 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, GlobalStreamId struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.componentId = iprot.readString();
       struct.set_componentId_isSet(true);
       struct.streamId = iprot.readString();
@@ -473,8 +473,8 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
index c4633a5..334ac97 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricPoint.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPoint, WorkerMetricPoint._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetricPoint> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerMetricPoint");
+public class WorkerMetricPoint implements org.apache.storm.thrift.TBase<WorkerMetricPoint, WorkerMetricPoint._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetricPoint> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerMetricPoint");
 
-  private static final org.apache.thrift.protocol.TField METRIC_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("metricName", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)2);
-  private static final org.apache.thrift.protocol.TField METRIC_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("metricValue", org.apache.thrift.protocol.TType.DOUBLE, (short)3);
-  private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("componentId", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField EXECUTOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("executorId", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("streamId", org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField METRIC_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("metricName", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("timestamp", org.apache.storm.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField METRIC_VALUE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("metricValue", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("componentId", org.apache.storm.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTOR_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executorId", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("streamId", org.apache.storm.thrift.protocol.TType.STRING, (short)6);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricPointStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricPointTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricPointStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricPointTupleSchemeFactory();
 
   private java.lang.String metricName; // required
   private long timestamp; // required
@@ -46,7 +46,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   private java.lang.String streamId; // 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 {
     METRIC_NAME((short)1, "metricName"),
     TIMESTAMP((short)2, "timestamp"),
     METRIC_VALUE((short)3, "metricValue"),
@@ -122,23 +122,23 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private static final int __METRICVALUE_ISSET_ID = 1;
   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.METRIC_NAME, new org.apache.thrift.meta_data.FieldMetaData("metricName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.METRIC_VALUE, new org.apache.thrift.meta_data.FieldMetaData("metricValue", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.COMPONENT_ID, new org.apache.thrift.meta_data.FieldMetaData("componentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EXECUTOR_ID, new org.apache.thrift.meta_data.FieldMetaData("executorId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.STREAM_ID, new org.apache.thrift.meta_data.FieldMetaData("streamId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.METRIC_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("metricName", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TIMESTAMP, new org.apache.storm.thrift.meta_data.FieldMetaData("timestamp", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.METRIC_VALUE, new org.apache.storm.thrift.meta_data.FieldMetaData("metricValue", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.COMPONENT_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("componentId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EXECUTOR_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("executorId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.STREAM_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("streamId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetricPoint.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetricPoint.class, metaDataMap);
   }
 
   public WorkerMetricPoint() {
@@ -233,16 +233,16 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   }
 
   public void unset_timestamp() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
   public boolean is_set_timestamp() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   public void set_timestamp_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
   }
 
   public double get_metricValue() {
@@ -255,16 +255,16 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
   }
 
   public void unset_metricValue() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
   }
 
   /** Returns true if field metricValue is set (has been assigned a value) and false otherwise */
   public boolean is_set_metricValue() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __METRICVALUE_ISSET_ID);
   }
 
   public void set_metricValue_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __METRICVALUE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __METRICVALUE_ISSET_ID, value);
   }
 
   public java.lang.String get_componentId() {
@@ -516,9 +516,9 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     if (is_set_metricName())
       hashCode = hashCode * 8191 + metricName.hashCode();
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timestamp);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(timestamp);
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(metricValue);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(metricValue);
 
     hashCode = hashCode * 8191 + ((is_set_componentId()) ? 131071 : 524287);
     if (is_set_componentId())
@@ -548,7 +548,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return lastComparison;
     }
     if (is_set_metricName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metricName, other.metricName);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.metricName, other.metricName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -558,7 +558,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return lastComparison;
     }
     if (is_set_timestamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -568,7 +568,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return lastComparison;
     }
     if (is_set_metricValue()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metricValue, other.metricValue);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.metricValue, other.metricValue);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -578,7 +578,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return lastComparison;
     }
     if (is_set_componentId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, other.componentId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.componentId, other.componentId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -588,7 +588,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return lastComparison;
     }
     if (is_set_executorId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executorId, other.executorId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executorId, other.executorId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -598,7 +598,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       return lastComparison;
     }
     if (is_set_streamId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, other.streamId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.streamId, other.streamId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -610,11 +610,11 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     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);
   }
 
@@ -666,30 +666,30 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     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_metricName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'metricName' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'metricName' is unset! Struct:" + toString());
     }
 
     if (!is_set_timestamp()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'timestamp' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'timestamp' is unset! Struct:" + toString());
     }
 
     if (!is_set_metricValue()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'metricValue' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'metricValue' is unset! Struct:" + toString());
     }
 
     if (!is_set_componentId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'componentId' is unset! Struct:" + toString());
     }
 
     if (!is_set_executorId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executorId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executorId' is unset! Struct:" + toString());
     }
 
     if (!is_set_streamId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -697,8 +697,8 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
 
   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);
     }
   }
@@ -707,80 +707,80 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     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 WorkerMetricPointStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerMetricPointStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerMetricPointStandardScheme getScheme() {
       return new WorkerMetricPointStandardScheme();
     }
   }
 
-  private static class WorkerMetricPointStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerMetricPoint> {
+  private static class WorkerMetricPointStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerMetricPoint> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerMetricPoint struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerMetricPoint 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: // METRIC_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.metricName = iprot.readString();
               struct.set_metricName_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: // TIMESTAMP
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.timestamp = iprot.readI64();
               struct.set_timestamp_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: // METRIC_VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.metricValue = iprot.readDouble();
               struct.set_metricValue_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: // COMPONENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.componentId = iprot.readString();
               struct.set_componentId_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: // EXECUTOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.executorId = iprot.readString();
               struct.set_executorId_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: // STREAM_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.streamId = iprot.readString();
               struct.set_streamId_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();
       }
@@ -788,7 +788,7 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerMetricPoint struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerMetricPoint struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -824,17 +824,17 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
 
   }
 
-  private static class WorkerMetricPointTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerMetricPointTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerMetricPointTupleScheme getScheme() {
       return new WorkerMetricPointTupleScheme();
     }
   }
 
-  private static class WorkerMetricPointTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerMetricPoint> {
+  private static class WorkerMetricPointTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerMetricPoint> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerMetricPoint 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, WorkerMetricPoint struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.metricName);
       oprot.writeI64(struct.timestamp);
       oprot.writeDouble(struct.metricValue);
@@ -844,8 +844,8 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerMetricPoint 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, WorkerMetricPoint struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.metricName = iprot.readString();
       struct.set_metricName_isSet(true);
       struct.timestamp = iprot.readI64();
@@ -861,8 +861,8 @@ public class WorkerMetricPoint implements org.apache.thrift.TBase<WorkerMetricPo
     }
   }
 
-  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/WorkerMetrics.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetrics.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetrics.java
index fca0694..4158ee0 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetrics.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetrics.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, WorkerMetrics._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetrics> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerMetrics");
+public class WorkerMetrics implements org.apache.storm.thrift.TBase<WorkerMetrics, WorkerMetrics._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetrics> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerMetrics");
 
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topologyId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostname", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField METRIC_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("metricList", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topologyId", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("hostname", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField METRIC_LIST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("metricList", org.apache.storm.thrift.protocol.TType.STRUCT, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricsTupleSchemeFactory();
 
   private java.lang.String topologyId; // required
   private int port; // required
@@ -42,7 +42,7 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
   private WorkerMetricList metricList; // 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 {
     TOPOLOGY_ID((short)1, "topologyId"),
     PORT((short)2, "port"),
     HOSTNAME((short)3, "hostname"),
@@ -111,19 +111,19 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
   // isset id assignments
   private static final int __PORT_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.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topologyId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.HOSTNAME, new org.apache.thrift.meta_data.FieldMetaData("hostname", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.METRIC_LIST, new org.apache.thrift.meta_data.FieldMetaData("metricList", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WorkerMetricList.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.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topologyId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.HOSTNAME, new org.apache.storm.thrift.meta_data.FieldMetaData("hostname", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.METRIC_LIST, new org.apache.storm.thrift.meta_data.FieldMetaData("metricList", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, WorkerMetricList.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetrics.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetrics.class, metaDataMap);
   }
 
   public WorkerMetrics() {
@@ -206,16 +206,16 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
   }
 
   public void unset_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public java.lang.String get_hostname() {
@@ -426,7 +426,7 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
       return lastComparison;
     }
     if (is_set_topologyId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topologyId, other.topologyId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topologyId, other.topologyId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -436,7 +436,7 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -446,7 +446,7 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
       return lastComparison;
     }
     if (is_set_hostname()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostname, other.hostname);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.hostname, other.hostname);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -456,7 +456,7 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
       return lastComparison;
     }
     if (is_set_metricList()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metricList, other.metricList);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.metricList, other.metricList);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -468,11 +468,11 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
     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);
   }
 
@@ -512,22 +512,22 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
     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_topologyId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topologyId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topologyId' is unset! Struct:" + toString());
     }
 
     if (!is_set_port()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
     }
 
     if (!is_set_hostname()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'hostname' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'hostname' is unset! Struct:" + toString());
     }
 
     if (!is_set_metricList()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'metricList' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'metricList' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -538,8 +538,8 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
 
   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);
     }
   }
@@ -548,65 +548,65 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
     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 WorkerMetricsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerMetricsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerMetricsStandardScheme getScheme() {
       return new WorkerMetricsStandardScheme();
     }
   }
 
-  private static class WorkerMetricsStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerMetrics> {
+  private static class WorkerMetricsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerMetrics> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerMetrics struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerMetrics 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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topologyId = iprot.readString();
               struct.set_topologyId_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.port = iprot.readI32();
               struct.set_port_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: // HOSTNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.hostname = iprot.readString();
               struct.set_hostname_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: // METRIC_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.metricList = new WorkerMetricList();
               struct.metricList.read(iprot);
               struct.set_metricList_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();
       }
@@ -614,7 +614,7 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerMetrics struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerMetrics struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -642,17 +642,17 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
 
   }
 
-  private static class WorkerMetricsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerMetricsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerMetricsTupleScheme getScheme() {
       return new WorkerMetricsTupleScheme();
     }
   }
 
-  private static class WorkerMetricsTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerMetrics> {
+  private static class WorkerMetricsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerMetrics> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerMetrics 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, WorkerMetrics struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.topologyId);
       oprot.writeI32(struct.port);
       oprot.writeString(struct.hostname);
@@ -660,8 +660,8 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerMetrics 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, WorkerMetrics struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.topologyId = iprot.readString();
       struct.set_topologyId_isSet(true);
       struct.port = iprot.readI32();
@@ -674,8 +674,8 @@ public class WorkerMetrics implements org.apache.thrift.TBase<WorkerMetrics, Wor
     }
   }
 
-  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/WorkerResources.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerResources.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerResources.java
index fcd7791..97cbee3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerResources.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerResources.java
@@ -25,19 +25,19 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class WorkerResources implements org.apache.thrift.TBase<WorkerResources, WorkerResources._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerResources> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerResources");
+public class WorkerResources implements org.apache.storm.thrift.TBase<WorkerResources, WorkerResources._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerResources> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerResources");
 
-  private static final org.apache.thrift.protocol.TField MEM_ON_HEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("mem_on_heap", org.apache.thrift.protocol.TType.DOUBLE, (short)1);
-  private static final org.apache.thrift.protocol.TField MEM_OFF_HEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("mem_off_heap", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
-  private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)3);
-  private static final org.apache.thrift.protocol.TField SHARED_MEM_ON_HEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("shared_mem_on_heap", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
-  private static final org.apache.thrift.protocol.TField SHARED_MEM_OFF_HEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("shared_mem_off_heap", org.apache.thrift.protocol.TType.DOUBLE, (short)5);
-  private static final org.apache.thrift.protocol.TField RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("resources", org.apache.thrift.protocol.TType.MAP, (short)6);
-  private static final org.apache.thrift.protocol.TField SHARED_RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("shared_resources", org.apache.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField MEM_ON_HEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("mem_on_heap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MEM_OFF_HEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("mem_off_heap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField SHARED_MEM_ON_HEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("shared_mem_on_heap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField SHARED_MEM_OFF_HEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("shared_mem_off_heap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField RESOURCES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("resources", org.apache.storm.thrift.protocol.TType.MAP, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField SHARED_RESOURCES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("shared_resources", org.apache.storm.thrift.protocol.TType.MAP, (short)7);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerResourcesStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerResourcesTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerResourcesStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerResourcesTupleSchemeFactory();
 
   private double mem_on_heap; // optional
   private double mem_off_heap; // optional
@@ -48,7 +48,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   private java.util.Map<java.lang.String,java.lang.Double> shared_resources; // 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 {
     MEM_ON_HEAP((short)1, "mem_on_heap"),
     MEM_OFF_HEAP((short)2, "mem_off_heap"),
     CPU((short)3, "cpu"),
@@ -131,29 +131,29 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   private static final int __SHARED_MEM_OFF_HEAP_ISSET_ID = 4;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.MEM_ON_HEAP,_Fields.MEM_OFF_HEAP,_Fields.CPU,_Fields.SHARED_MEM_ON_HEAP,_Fields.SHARED_MEM_OFF_HEAP,_Fields.RESOURCES,_Fields.SHARED_RESOURCES};
-  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.MEM_ON_HEAP, new org.apache.thrift.meta_data.FieldMetaData("mem_on_heap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.MEM_OFF_HEAP, new org.apache.thrift.meta_data.FieldMetaData("mem_off_heap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.CPU, new org.apache.thrift.meta_data.FieldMetaData("cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.SHARED_MEM_ON_HEAP, new org.apache.thrift.meta_data.FieldMetaData("shared_mem_on_heap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.SHARED_MEM_OFF_HEAP, new org.apache.thrift.meta_data.FieldMetaData("shared_mem_off_heap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.RESOURCES, new org.apache.thrift.meta_data.FieldMetaData("resources", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
-    tmpMap.put(_Fields.SHARED_RESOURCES, new org.apache.thrift.meta_data.FieldMetaData("shared_resources", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
+    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.MEM_ON_HEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("mem_on_heap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.MEM_OFF_HEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("mem_off_heap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.SHARED_MEM_ON_HEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("shared_mem_on_heap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.SHARED_MEM_OFF_HEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("shared_mem_off_heap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.RESOURCES, new org.apache.storm.thrift.meta_data.FieldMetaData("resources", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
+    tmpMap.put(_Fields.SHARED_RESOURCES, new org.apache.storm.thrift.meta_data.FieldMetaData("shared_resources", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerResources.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerResources.class, metaDataMap);
   }
 
   public WorkerResources() {
@@ -209,16 +209,16 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   }
 
   public void unset_mem_on_heap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEM_ON_HEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEM_ON_HEAP_ISSET_ID);
   }
 
   /** Returns true if field mem_on_heap is set (has been assigned a value) and false otherwise */
   public boolean is_set_mem_on_heap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MEM_ON_HEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __MEM_ON_HEAP_ISSET_ID);
   }
 
   public void set_mem_on_heap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MEM_ON_HEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MEM_ON_HEAP_ISSET_ID, value);
   }
 
   public double get_mem_off_heap() {
@@ -231,16 +231,16 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   }
 
   public void unset_mem_off_heap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEM_OFF_HEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __MEM_OFF_HEAP_ISSET_ID);
   }
 
   /** Returns true if field mem_off_heap is set (has been assigned a value) and false otherwise */
   public boolean is_set_mem_off_heap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MEM_OFF_HEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __MEM_OFF_HEAP_ISSET_ID);
   }
 
   public void set_mem_off_heap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MEM_OFF_HEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __MEM_OFF_HEAP_ISSET_ID, value);
   }
 
   public double get_cpu() {
@@ -253,16 +253,16 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   }
 
   public void unset_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __CPU_ISSET_ID);
   }
 
   /** Returns true if field cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __CPU_ISSET_ID);
   }
 
   public void set_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __CPU_ISSET_ID, value);
   }
 
   public double get_shared_mem_on_heap() {
@@ -275,16 +275,16 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   }
 
   public void unset_shared_mem_on_heap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SHARED_MEM_ON_HEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __SHARED_MEM_ON_HEAP_ISSET_ID);
   }
 
   /** Returns true if field shared_mem_on_heap is set (has been assigned a value) and false otherwise */
   public boolean is_set_shared_mem_on_heap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SHARED_MEM_ON_HEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __SHARED_MEM_ON_HEAP_ISSET_ID);
   }
 
   public void set_shared_mem_on_heap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SHARED_MEM_ON_HEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __SHARED_MEM_ON_HEAP_ISSET_ID, value);
   }
 
   public double get_shared_mem_off_heap() {
@@ -297,16 +297,16 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
   }
 
   public void unset_shared_mem_off_heap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SHARED_MEM_OFF_HEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __SHARED_MEM_OFF_HEAP_ISSET_ID);
   }
 
   /** Returns true if field shared_mem_off_heap is set (has been assigned a value) and false otherwise */
   public boolean is_set_shared_mem_off_heap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SHARED_MEM_OFF_HEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __SHARED_MEM_OFF_HEAP_ISSET_ID);
   }
 
   public void set_shared_mem_off_heap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SHARED_MEM_OFF_HEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __SHARED_MEM_OFF_HEAP_ISSET_ID, value);
   }
 
   public int get_resources_size() {
@@ -577,23 +577,23 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
 
     hashCode = hashCode * 8191 + ((is_set_mem_on_heap()) ? 131071 : 524287);
     if (is_set_mem_on_heap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(mem_on_heap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(mem_on_heap);
 
     hashCode = hashCode * 8191 + ((is_set_mem_off_heap()) ? 131071 : 524287);
     if (is_set_mem_off_heap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(mem_off_heap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(mem_off_heap);
 
     hashCode = hashCode * 8191 + ((is_set_cpu()) ? 131071 : 524287);
     if (is_set_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(cpu);
 
     hashCode = hashCode * 8191 + ((is_set_shared_mem_on_heap()) ? 131071 : 524287);
     if (is_set_shared_mem_on_heap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(shared_mem_on_heap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(shared_mem_on_heap);
 
     hashCode = hashCode * 8191 + ((is_set_shared_mem_off_heap()) ? 131071 : 524287);
     if (is_set_shared_mem_off_heap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(shared_mem_off_heap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(shared_mem_off_heap);
 
     hashCode = hashCode * 8191 + ((is_set_resources()) ? 131071 : 524287);
     if (is_set_resources())
@@ -619,7 +619,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_mem_on_heap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mem_on_heap, other.mem_on_heap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.mem_on_heap, other.mem_on_heap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -629,7 +629,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_mem_off_heap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mem_off_heap, other.mem_off_heap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.mem_off_heap, other.mem_off_heap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -639,7 +639,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpu, other.cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.cpu, other.cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -649,7 +649,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_shared_mem_on_heap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shared_mem_on_heap, other.shared_mem_on_heap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.shared_mem_on_heap, other.shared_mem_on_heap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -659,7 +659,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_shared_mem_off_heap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shared_mem_off_heap, other.shared_mem_off_heap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.shared_mem_off_heap, other.shared_mem_off_heap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -669,7 +669,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_resources()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resources, other.resources);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.resources, other.resources);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -679,7 +679,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       return lastComparison;
     }
     if (is_set_shared_resources()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shared_resources, other.shared_resources);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.shared_resources, other.shared_resources);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -691,11 +691,11 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
     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);
   }
 
@@ -757,15 +757,15 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -774,74 +774,74 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
     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 WorkerResourcesStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerResourcesStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerResourcesStandardScheme getScheme() {
       return new WorkerResourcesStandardScheme();
     }
   }
 
-  private static class WorkerResourcesStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerResources> {
+  private static class WorkerResourcesStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerResources> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerResources struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerResources 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: // MEM_ON_HEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.mem_on_heap = iprot.readDouble();
               struct.set_mem_on_heap_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: // MEM_OFF_HEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.mem_off_heap = iprot.readDouble();
               struct.set_mem_off_heap_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: // CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.cpu = iprot.readDouble();
               struct.set_cpu_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: // SHARED_MEM_ON_HEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.shared_mem_on_heap = iprot.readDouble();
               struct.set_shared_mem_on_heap_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: // SHARED_MEM_OFF_HEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.shared_mem_off_heap = iprot.readDouble();
               struct.set_shared_mem_off_heap_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: // RESOURCES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map666 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map666 = iprot.readMapBegin();
                 struct.resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map666.size);
                 java.lang.String _key667;
                 double _val668;
@@ -855,13 +855,13 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
               }
               struct.set_resources_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: // SHARED_RESOURCES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map670 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map670 = iprot.readMapBegin();
                 struct.shared_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map670.size);
                 java.lang.String _key671;
                 double _val672;
@@ -875,11 +875,11 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
               }
               struct.set_shared_resources_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();
       }
@@ -887,7 +887,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerResources struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerResources struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -920,7 +920,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
         if (struct.is_set_resources()) {
           oprot.writeFieldBegin(RESOURCES_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.resources.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.resources.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter674 : struct.resources.entrySet())
             {
               oprot.writeString(_iter674.getKey());
@@ -935,7 +935,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
         if (struct.is_set_shared_resources()) {
           oprot.writeFieldBegin(SHARED_RESOURCES_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.shared_resources.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.shared_resources.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter675 : struct.shared_resources.entrySet())
             {
               oprot.writeString(_iter675.getKey());
@@ -952,17 +952,17 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
 
   }
 
-  private static class WorkerResourcesTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerResourcesTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerResourcesTupleScheme getScheme() {
       return new WorkerResourcesTupleScheme();
     }
   }
 
-  private static class WorkerResourcesTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerResources> {
+  private static class WorkerResourcesTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerResources> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerResources 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, WorkerResources struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_mem_on_heap()) {
         optionals.set(0);
@@ -1024,8 +1024,8 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerResources 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, WorkerResources struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         struct.mem_on_heap = iprot.readDouble();
@@ -1049,7 +1049,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TMap _map678 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map678 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map678.size);
           java.lang.String _key679;
           double _val680;
@@ -1064,7 +1064,7 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TMap _map682 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map682 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.shared_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map682.size);
           java.lang.String _key683;
           double _val684;
@@ -1080,8 +1080,8 @@ public class WorkerResources implements org.apache.thrift.TBase<WorkerResources,
     }
   }
 
-  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();
   }
 }
 


[47/50] [abbrv] storm git commit: STORM-2882: Addressed review comments

Posted by bo...@apache.org.
STORM-2882: Addressed review comments


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/492eff4e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/492eff4e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/492eff4e

Branch: refs/heads/master
Commit: 492eff4e7203d8a060cfa6c9c20d8bea28235be3
Parents: 71b61d9
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jun 5 10:04:44 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 shaded-deps/pom.xml                             |  8 +-
 .../storm/container/cgroup/SystemOperation.java |  5 +-
 .../security/auth/ClientAuthUtilsTest.java      |  2 +-
 storm-core/pom.xml                              | 87 +-------------------
 4 files changed, 9 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/492eff4e/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 1ff6cb2..aa92f8f 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -48,9 +48,9 @@
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </dependency>
-        <!-- recipes are not used by the client, but storm server uses the same
-             shaded curator instance so we need to include it here so we have a
-             single ZK connection per daemon. -->
+        <!-- curator-recipes is not used by storm-client, but because storm-server
+             uses the same zookeeper initialization code as storm-client all
+             curator usage, including that by curator-recipes, must also be shaded. -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
@@ -74,12 +74,10 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/492eff4e/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java b/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
index a20b828..17a1a71 100644
--- a/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
+++ b/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
@@ -14,7 +14,6 @@ package org.apache.storm.container.cgroup;
 
 import java.io.IOException;
 import java.nio.channels.ClosedByInterruptException;
-import org.apache.storm.shade.com.google.common.base.Charsets;
 import org.apache.storm.shade.org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,8 +54,8 @@ public class SystemOperation {
         Process process = new ProcessBuilder(new String[]{ "/bin/bash", "-c", cmd }).start();
         try {
             process.waitFor();
-            String output = IOUtils.toString(process.getInputStream(), Charsets.UTF_8);
-            String errorOutput = IOUtils.toString(process.getErrorStream(), Charsets.UTF_8);
+            String output = IOUtils.toString(process.getInputStream());
+            String errorOutput = IOUtils.toString(process.getErrorStream());
             LOG.debug("Shell Output: {}", output);
             if (errorOutput.length() != 0) {
                 LOG.error("Shell Error Output: {}", errorOutput);

http://git-wip-us.apache.org/repos/asf/storm/blob/492eff4e/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
index dbbba14..9f09ee4 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
@@ -209,7 +209,7 @@ public class ClientAuthUtilsTest {
     }
 
     @Test
-    public void uiHttpCredentialsPluginTest() {
+    public void pluginCreationTest() {
         Map<String, Object> conf = new HashMap<>();
         conf.put(
             Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN, AuthUtilsTestMock.class.getName());

http://git-wip-us.apache.org/repos/asf/storm/blob/492eff4e/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3619660..47fd498 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -55,10 +55,6 @@
             This is here as a work around to place it at the beginning of the classpath
             even though maven does not officially support ordering of the classpath.-->
         <dependency>
-            <groupId>uk.org.lidalia</groupId>
-            <artifactId>sysout-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
@@ -149,82 +145,18 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-exec</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-test</artifactId>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.twitter</groupId>
-            <artifactId>carbonite</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jgrapht</groupId>
-            <artifactId>jgrapht-core</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -243,28 +175,19 @@
             <artifactId>log4j-over-slf4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>metrics-clojure</groupId>
-            <artifactId>metrics-clojure</artifactId>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -303,10 +226,6 @@
             <artifactId>jackson-dataformat-smile</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-client</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
         </dependency>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java b/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
index 2fdb3ef..062b3c7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
@@ -25,17 +25,17 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalAssignment");
+public class LocalAssignment implements org.apache.storm.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LocalAssignment");
 
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)2);
-  private static final org.apache.thrift.protocol.TField RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("resources", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField TOTAL_NODE_SHARED_FIELD_DESC = new org.apache.thrift.protocol.TField("total_node_shared", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executors", org.apache.storm.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField RESOURCES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("resources", org.apache.storm.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_NODE_SHARED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_node_shared", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LocalAssignmentStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LocalAssignmentTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LocalAssignmentStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LocalAssignmentTupleSchemeFactory();
 
   private java.lang.String topology_id; // required
   private java.util.List<ExecutorInfo> executors; // required
@@ -44,7 +44,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
   private java.lang.String owner; // 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 {
     TOPOLOGY_ID((short)1, "topology_id"),
     EXECUTORS((short)2, "executors"),
     RESOURCES((short)3, "resources"),
@@ -117,22 +117,22 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
   private static final int __TOTAL_NODE_SHARED_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.RESOURCES,_Fields.TOTAL_NODE_SHARED,_Fields.OWNER};
-  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.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, ExecutorInfo.class))));
-    tmpMap.put(_Fields.RESOURCES, new org.apache.thrift.meta_data.FieldMetaData("resources", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WorkerResources.class)));
-    tmpMap.put(_Fields.TOTAL_NODE_SHARED, new org.apache.thrift.meta_data.FieldMetaData("total_node_shared", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("executors", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorInfo.class))));
+    tmpMap.put(_Fields.RESOURCES, new org.apache.storm.thrift.meta_data.FieldMetaData("resources", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, WorkerResources.class)));
+    tmpMap.put(_Fields.TOTAL_NODE_SHARED, new org.apache.storm.thrift.meta_data.FieldMetaData("total_node_shared", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LocalAssignment.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LocalAssignment.class, metaDataMap);
   }
 
   public LocalAssignment() {
@@ -279,16 +279,16 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
   }
 
   public void unset_total_node_shared() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_NODE_SHARED_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TOTAL_NODE_SHARED_ISSET_ID);
   }
 
   /** Returns true if field total_node_shared is set (has been assigned a value) and false otherwise */
   public boolean is_set_total_node_shared() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_NODE_SHARED_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TOTAL_NODE_SHARED_ISSET_ID);
   }
 
   public void set_total_node_shared_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_NODE_SHARED_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TOTAL_NODE_SHARED_ISSET_ID, value);
   }
 
   public java.lang.String get_owner() {
@@ -482,7 +482,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
 
     hashCode = hashCode * 8191 + ((is_set_total_node_shared()) ? 131071 : 524287);
     if (is_set_total_node_shared())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(total_node_shared);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(total_node_shared);
 
     hashCode = hashCode * 8191 + ((is_set_owner()) ? 131071 : 524287);
     if (is_set_owner())
@@ -504,7 +504,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       return lastComparison;
     }
     if (is_set_topology_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -514,7 +514,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       return lastComparison;
     }
     if (is_set_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executors, other.executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -524,7 +524,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       return lastComparison;
     }
     if (is_set_resources()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resources, other.resources);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.resources, other.resources);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -534,7 +534,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       return lastComparison;
     }
     if (is_set_total_node_shared()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_node_shared, other.total_node_shared);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_node_shared, other.total_node_shared);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -544,7 +544,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -556,11 +556,11 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
     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);
   }
 
@@ -614,14 +614,14 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
     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_topology_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_executors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -632,8 +632,8 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
 
   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);
     }
   }
@@ -642,42 +642,42 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
     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 LocalAssignmentStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LocalAssignmentStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LocalAssignmentStandardScheme getScheme() {
       return new LocalAssignmentStandardScheme();
     }
   }
 
-  private static class LocalAssignmentStandardScheme extends org.apache.thrift.scheme.StandardScheme<LocalAssignment> {
+  private static class LocalAssignmentStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LocalAssignment> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LocalAssignment struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LocalAssignment 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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_id = iprot.readString();
               struct.set_topology_id_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: // EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list792 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list792 = iprot.readListBegin();
                 struct.executors = new java.util.ArrayList<ExecutorInfo>(_list792.size);
                 ExecutorInfo _elem793;
                 for (int _i794 = 0; _i794 < _list792.size; ++_i794)
@@ -690,36 +690,36 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
               }
               struct.set_executors_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: // RESOURCES
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.resources = new WorkerResources();
               struct.resources.read(iprot);
               struct.set_resources_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: // TOTAL_NODE_SHARED
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.total_node_shared = iprot.readDouble();
               struct.set_total_node_shared_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: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_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();
       }
@@ -727,7 +727,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LocalAssignment struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LocalAssignment struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -739,7 +739,7 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
       if (struct.executors != null) {
         oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.executors.size()));
           for (ExecutorInfo _iter795 : struct.executors)
           {
             _iter795.write(oprot);
@@ -773,17 +773,17 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
 
   }
 
-  private static class LocalAssignmentTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LocalAssignmentTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LocalAssignmentTupleScheme getScheme() {
       return new LocalAssignmentTupleScheme();
     }
   }
 
-  private static class LocalAssignmentTupleScheme extends org.apache.thrift.scheme.TupleScheme<LocalAssignment> {
+  private static class LocalAssignmentTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LocalAssignment> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LocalAssignment 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, LocalAssignment struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.topology_id);
       {
         oprot.writeI32(struct.executors.size());
@@ -815,12 +815,12 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LocalAssignment 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, LocalAssignment struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.topology_id = iprot.readString();
       struct.set_topology_id_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list797 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list797 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.executors = new java.util.ArrayList<ExecutorInfo>(_list797.size);
         ExecutorInfo _elem798;
         for (int _i799 = 0; _i799 < _list797.size; ++_i799)
@@ -848,8 +848,8 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
     }
   }
 
-  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/LocalStateData.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java b/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
index 8948a67..6bd67aa 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalStateData");
+public class LocalStateData implements org.apache.storm.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LocalStateData");
 
-  private static final org.apache.thrift.protocol.TField SERIALIZED_PARTS_FIELD_DESC = new org.apache.thrift.protocol.TField("serialized_parts", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SERIALIZED_PARTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("serialized_parts", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LocalStateDataStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LocalStateDataTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LocalStateDataStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LocalStateDataTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,ThriftSerializedObject> serialized_parts; // 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 {
     SERIALIZED_PARTS((short)1, "serialized_parts");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,15 +94,15 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
   }
 
   // isset id assignments
-  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.SERIALIZED_PARTS, new org.apache.thrift.meta_data.FieldMetaData("serialized_parts", 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, ThriftSerializedObject.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.SERIALIZED_PARTS, new org.apache.storm.thrift.meta_data.FieldMetaData("serialized_parts", 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, ThriftSerializedObject.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LocalStateData.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LocalStateData.class, metaDataMap);
   }
 
   public LocalStateData() {
@@ -265,7 +265,7 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
       return lastComparison;
     }
     if (is_set_serialized_parts()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serialized_parts, other.serialized_parts);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.serialized_parts, other.serialized_parts);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -277,11 +277,11 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
     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);
   }
 
@@ -301,10 +301,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
     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_serialized_parts()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'serialized_parts' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'serialized_parts' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -312,42 +312,42 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
 
   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 LocalStateDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LocalStateDataStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LocalStateDataStandardScheme getScheme() {
       return new LocalStateDataStandardScheme();
     }
   }
 
-  private static class LocalStateDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<LocalStateData> {
+  private static class LocalStateDataStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LocalStateData> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LocalStateData struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LocalStateData 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: // SERIALIZED_PARTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map782 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map782 = iprot.readMapBegin();
                 struct.serialized_parts = new java.util.HashMap<java.lang.String,ThriftSerializedObject>(2*_map782.size);
                 java.lang.String _key783;
                 ThriftSerializedObject _val784;
@@ -362,11 +362,11 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
               }
               struct.set_serialized_parts_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();
       }
@@ -374,14 +374,14 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LocalStateData struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LocalStateData struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.serialized_parts != null) {
         oprot.writeFieldBegin(SERIALIZED_PARTS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.serialized_parts.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.serialized_parts.size()));
           for (java.util.Map.Entry<java.lang.String, ThriftSerializedObject> _iter786 : struct.serialized_parts.entrySet())
           {
             oprot.writeString(_iter786.getKey());
@@ -397,17 +397,17 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
 
   }
 
-  private static class LocalStateDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LocalStateDataTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LocalStateDataTupleScheme getScheme() {
       return new LocalStateDataTupleScheme();
     }
   }
 
-  private static class LocalStateDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<LocalStateData> {
+  private static class LocalStateDataTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LocalStateData> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData 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, LocalStateData struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.serialized_parts.size());
         for (java.util.Map.Entry<java.lang.String, ThriftSerializedObject> _iter787 : struct.serialized_parts.entrySet())
@@ -419,10 +419,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData 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, LocalStateData 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 _map788 = 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 _map788 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.serialized_parts = new java.util.HashMap<java.lang.String,ThriftSerializedObject>(2*_map788.size);
         java.lang.String _key789;
         ThriftSerializedObject _val790;
@@ -438,8 +438,8 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
     }
   }
 
-  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/LogConfig.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java b/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
index 9c6ed85..3b7555a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._Fields>, java.io.Serializable, Cloneable, Comparable<LogConfig> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LogConfig");
+public class LogConfig implements org.apache.storm.thrift.TBase<LogConfig, LogConfig._Fields>, java.io.Serializable, Cloneable, Comparable<LogConfig> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LogConfig");
 
-  private static final org.apache.thrift.protocol.TField NAMED_LOGGER_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("named_logger_level", org.apache.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NAMED_LOGGER_LEVEL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("named_logger_level", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LogConfigStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LogConfigTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LogConfigStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LogConfigTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,LogLevel> named_logger_level; // 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 {
     NAMED_LOGGER_LEVEL((short)2, "named_logger_level");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -95,15 +95,15 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.NAMED_LOGGER_LEVEL};
-  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.NAMED_LOGGER_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("named_logger_level", 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, LogLevel.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.NAMED_LOGGER_LEVEL, new org.apache.storm.thrift.meta_data.FieldMetaData("named_logger_level", 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, LogLevel.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogConfig.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogConfig.class, metaDataMap);
   }
 
   public LogConfig() {
@@ -259,7 +259,7 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
       return lastComparison;
     }
     if (is_set_named_logger_level()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.named_logger_level, other.named_logger_level);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.named_logger_level, other.named_logger_level);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -271,11 +271,11 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
     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);
   }
 
@@ -297,49 +297,49 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 LogConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LogConfigStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LogConfigStandardScheme getScheme() {
       return new LogConfigStandardScheme();
     }
   }
 
-  private static class LogConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<LogConfig> {
+  private static class LogConfigStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LogConfig> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LogConfig struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LogConfig 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 2: // NAMED_LOGGER_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map852 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map852 = iprot.readMapBegin();
                 struct.named_logger_level = new java.util.HashMap<java.lang.String,LogLevel>(2*_map852.size);
                 java.lang.String _key853;
                 LogLevel _val854;
@@ -354,11 +354,11 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
               }
               struct.set_named_logger_level_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();
       }
@@ -366,7 +366,7 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LogConfig struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LogConfig struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -374,7 +374,7 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
         if (struct.is_set_named_logger_level()) {
           oprot.writeFieldBegin(NAMED_LOGGER_LEVEL_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.named_logger_level.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.named_logger_level.size()));
             for (java.util.Map.Entry<java.lang.String, LogLevel> _iter856 : struct.named_logger_level.entrySet())
             {
               oprot.writeString(_iter856.getKey());
@@ -391,17 +391,17 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
 
   }
 
-  private static class LogConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LogConfigTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LogConfigTupleScheme getScheme() {
       return new LogConfigTupleScheme();
     }
   }
 
-  private static class LogConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<LogConfig> {
+  private static class LogConfigTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LogConfig> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LogConfig 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, LogConfig struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_named_logger_level()) {
         optionals.set(0);
@@ -420,12 +420,12 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LogConfig 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, LogConfig struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map858 = 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 _map858 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.named_logger_level = new java.util.HashMap<java.lang.String,LogLevel>(2*_map858.size);
           java.lang.String _key859;
           LogLevel _val860;
@@ -442,8 +442,8 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
     }
   }
 
-  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/LogLevel.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LogLevel.java b/storm-client/src/jvm/org/apache/storm/generated/LogLevel.java
index c0180a8..a8fe7d1 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LogLevel.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LogLevel.java
@@ -25,17 +25,17 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fields>, java.io.Serializable, Cloneable, Comparable<LogLevel> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LogLevel");
+public class LogLevel implements org.apache.storm.thrift.TBase<LogLevel, LogLevel._Fields>, java.io.Serializable, Cloneable, Comparable<LogLevel> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("LogLevel");
 
-  private static final org.apache.thrift.protocol.TField ACTION_FIELD_DESC = new org.apache.thrift.protocol.TField("action", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField TARGET_LOG_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("target_log_level", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField RESET_LOG_LEVEL_TIMEOUT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("reset_log_level_timeout_secs", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField RESET_LOG_LEVEL_TIMEOUT_EPOCH_FIELD_DESC = new org.apache.thrift.protocol.TField("reset_log_level_timeout_epoch", org.apache.thrift.protocol.TType.I64, (short)4);
-  private static final org.apache.thrift.protocol.TField RESET_LOG_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("reset_log_level", org.apache.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField ACTION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("action", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TARGET_LOG_LEVEL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("target_log_level", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField RESET_LOG_LEVEL_TIMEOUT_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("reset_log_level_timeout_secs", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField RESET_LOG_LEVEL_TIMEOUT_EPOCH_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("reset_log_level_timeout_epoch", org.apache.storm.thrift.protocol.TType.I64, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField RESET_LOG_LEVEL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("reset_log_level", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LogLevelStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LogLevelTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LogLevelStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LogLevelTupleSchemeFactory();
 
   private LogLevelAction action; // required
   private java.lang.String target_log_level; // optional
@@ -44,7 +44,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
   private java.lang.String reset_log_level; // 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 LogLevelAction
@@ -122,21 +122,21 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
   private static final int __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.TARGET_LOG_LEVEL,_Fields.RESET_LOG_LEVEL_TIMEOUT_SECS,_Fields.RESET_LOG_LEVEL_TIMEOUT_EPOCH,_Fields.RESET_LOG_LEVEL};
-  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.ACTION, new org.apache.thrift.meta_data.FieldMetaData("action", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, LogLevelAction.class)));
-    tmpMap.put(_Fields.TARGET_LOG_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("target_log_level", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESET_LOG_LEVEL_TIMEOUT_SECS, new org.apache.thrift.meta_data.FieldMetaData("reset_log_level_timeout_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.RESET_LOG_LEVEL_TIMEOUT_EPOCH, new org.apache.thrift.meta_data.FieldMetaData("reset_log_level_timeout_epoch", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.RESET_LOG_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("reset_log_level", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.ACTION, new org.apache.storm.thrift.meta_data.FieldMetaData("action", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, LogLevelAction.class)));
+    tmpMap.put(_Fields.TARGET_LOG_LEVEL, new org.apache.storm.thrift.meta_data.FieldMetaData("target_log_level", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.RESET_LOG_LEVEL_TIMEOUT_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("reset_log_level_timeout_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.RESET_LOG_LEVEL_TIMEOUT_EPOCH, new org.apache.storm.thrift.meta_data.FieldMetaData("reset_log_level_timeout_epoch", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.RESET_LOG_LEVEL, new org.apache.storm.thrift.meta_data.FieldMetaData("reset_log_level", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogLevel.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogLevel.class, metaDataMap);
   }
 
   public LogLevel() {
@@ -246,16 +246,16 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
   }
 
   public void unset_reset_log_level_timeout_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_SECS_ISSET_ID);
   }
 
   /** Returns true if field reset_log_level_timeout_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_reset_log_level_timeout_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_SECS_ISSET_ID);
   }
 
   public void set_reset_log_level_timeout_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_SECS_ISSET_ID, value);
   }
 
   public long get_reset_log_level_timeout_epoch() {
@@ -268,16 +268,16 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
   }
 
   public void unset_reset_log_level_timeout_epoch() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID);
   }
 
   /** Returns true if field reset_log_level_timeout_epoch is set (has been assigned a value) and false otherwise */
   public boolean is_set_reset_log_level_timeout_epoch() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID);
   }
 
   public void set_reset_log_level_timeout_epoch_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __RESET_LOG_LEVEL_TIMEOUT_EPOCH_ISSET_ID, value);
   }
 
   public java.lang.String get_reset_log_level() {
@@ -471,7 +471,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
 
     hashCode = hashCode * 8191 + ((is_set_reset_log_level_timeout_epoch()) ? 131071 : 524287);
     if (is_set_reset_log_level_timeout_epoch())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reset_log_level_timeout_epoch);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(reset_log_level_timeout_epoch);
 
     hashCode = hashCode * 8191 + ((is_set_reset_log_level()) ? 131071 : 524287);
     if (is_set_reset_log_level())
@@ -493,7 +493,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
       return lastComparison;
     }
     if (is_set_action()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.action, other.action);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.action, other.action);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -503,7 +503,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
       return lastComparison;
     }
     if (is_set_target_log_level()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.target_log_level, other.target_log_level);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.target_log_level, other.target_log_level);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -513,7 +513,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
       return lastComparison;
     }
     if (is_set_reset_log_level_timeout_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reset_log_level_timeout_secs, other.reset_log_level_timeout_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.reset_log_level_timeout_secs, other.reset_log_level_timeout_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -523,7 +523,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
       return lastComparison;
     }
     if (is_set_reset_log_level_timeout_epoch()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reset_log_level_timeout_epoch, other.reset_log_level_timeout_epoch);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.reset_log_level_timeout_epoch, other.reset_log_level_timeout_epoch);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -533,7 +533,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
       return lastComparison;
     }
     if (is_set_reset_log_level()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reset_log_level, other.reset_log_level);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.reset_log_level, other.reset_log_level);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -545,11 +545,11 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
     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);
   }
 
@@ -601,10 +601,10 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
     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_action()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'action' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'action' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -612,8 +612,8 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
 
   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);
     }
   }
@@ -622,72 +622,72 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
     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 LogLevelStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LogLevelStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LogLevelStandardScheme getScheme() {
       return new LogLevelStandardScheme();
     }
   }
 
-  private static class LogLevelStandardScheme extends org.apache.thrift.scheme.StandardScheme<LogLevel> {
+  private static class LogLevelStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<LogLevel> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LogLevel struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, LogLevel 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: // ACTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.action = org.apache.storm.generated.LogLevelAction.findByValue(iprot.readI32());
               struct.set_action_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: // TARGET_LOG_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.target_log_level = iprot.readString();
               struct.set_target_log_level_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: // RESET_LOG_LEVEL_TIMEOUT_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.reset_log_level_timeout_secs = iprot.readI32();
               struct.set_reset_log_level_timeout_secs_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: // RESET_LOG_LEVEL_TIMEOUT_EPOCH
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.reset_log_level_timeout_epoch = iprot.readI64();
               struct.set_reset_log_level_timeout_epoch_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: // RESET_LOG_LEVEL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.reset_log_level = iprot.readString();
               struct.set_reset_log_level_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();
       }
@@ -695,7 +695,7 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LogLevel struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, LogLevel struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -734,17 +734,17 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
 
   }
 
-  private static class LogLevelTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class LogLevelTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public LogLevelTupleScheme getScheme() {
       return new LogLevelTupleScheme();
     }
   }
 
-  private static class LogLevelTupleScheme extends org.apache.thrift.scheme.TupleScheme<LogLevel> {
+  private static class LogLevelTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<LogLevel> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LogLevel 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, LogLevel struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI32(struct.action.getValue());
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_target_log_level()) {
@@ -775,8 +775,8 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LogLevel 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, LogLevel struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.action = org.apache.storm.generated.LogLevelAction.findByValue(iprot.readI32());
       struct.set_action_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(4);
@@ -799,8 +799,8 @@ public class LogLevel implements org.apache.thrift.TBase<LogLevel, LogLevel._Fie
     }
   }
 
-  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/LogLevelAction.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LogLevelAction.java b/storm-client/src/jvm/org/apache/storm/generated/LogLevelAction.java
index e317271..720f9b7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LogLevelAction.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LogLevelAction.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum LogLevelAction implements org.apache.thrift.TEnum {
+public enum LogLevelAction implements org.apache.storm.thrift.TEnum {
   UNCHANGED(1),
   UPDATE(2),
   REMOVE(3);


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java b/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
index 78cd90e..d810248 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
@@ -25,23 +25,23 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._Fields>, java.io.Serializable, Cloneable, Comparable<StormBase> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormBase");
-
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField COMPONENT_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("component_executors", org.apache.thrift.protocol.TType.MAP, (short)4);
-  private static final org.apache.thrift.protocol.TField LAUNCH_TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("launch_time_secs", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)6);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ACTION_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_action_options", org.apache.thrift.protocol.TType.STRUCT, (short)7);
-  private static final org.apache.thrift.protocol.TField PREV_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("prev_status", org.apache.thrift.protocol.TType.I32, (short)8);
-  private static final org.apache.thrift.protocol.TField COMPONENT_DEBUG_FIELD_DESC = new org.apache.thrift.protocol.TField("component_debug", org.apache.thrift.protocol.TType.MAP, (short)9);
-  private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)10);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_version", org.apache.thrift.protocol.TType.STRING, (short)11);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StormBaseStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StormBaseTupleSchemeFactory();
+public class StormBase implements org.apache.storm.thrift.TBase<StormBase, StormBase._Fields>, java.io.Serializable, Cloneable, Comparable<StormBase> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("StormBase");
+
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("status", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_workers", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_executors", org.apache.storm.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField LAUNCH_TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("launch_time_secs", org.apache.storm.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ACTION_OPTIONS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_action_options", org.apache.storm.thrift.protocol.TType.STRUCT, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField PREV_STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("prev_status", org.apache.storm.thrift.protocol.TType.I32, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_DEBUG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_debug", org.apache.storm.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("principal", org.apache.storm.thrift.protocol.TType.STRING, (short)10);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_version", org.apache.storm.thrift.protocol.TType.STRING, (short)11);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StormBaseStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StormBaseTupleSchemeFactory();
 
   private java.lang.String name; // required
   private TopologyStatus status; // required
@@ -56,7 +56,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
   private java.lang.String topology_version; // 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 {
     NAME((short)1, "name"),
     /**
      * 
@@ -156,37 +156,37 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
   private static final int __LAUNCH_TIME_SECS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.COMPONENT_EXECUTORS,_Fields.LAUNCH_TIME_SECS,_Fields.OWNER,_Fields.TOPOLOGY_ACTION_OPTIONS,_Fields.PREV_STATUS,_Fields.COMPONENT_DEBUG,_Fields.PRINCIPAL,_Fields.TOPOLOGY_VERSION};
-  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.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TopologyStatus.class)));
-    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.COMPONENT_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("component_executors", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
-    tmpMap.put(_Fields.LAUNCH_TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("launch_time_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOPOLOGY_ACTION_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("topology_action_options", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TopologyActionOptions.class)));
-    tmpMap.put(_Fields.PREV_STATUS, new org.apache.thrift.meta_data.FieldMetaData("prev_status", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TopologyStatus.class)));
-    tmpMap.put(_Fields.COMPONENT_DEBUG, new org.apache.thrift.meta_data.FieldMetaData("component_debug", 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, DebugOptions.class))));
-    tmpMap.put(_Fields.PRINCIPAL, new org.apache.thrift.meta_data.FieldMetaData("principal", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOPOLOGY_VERSION, new org.apache.thrift.meta_data.FieldMetaData("topology_version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("status", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, TopologyStatus.class)));
+    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_workers", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.COMPONENT_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("component_executors", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32))));
+    tmpMap.put(_Fields.LAUNCH_TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("launch_time_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOPOLOGY_ACTION_OPTIONS, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_action_options", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, TopologyActionOptions.class)));
+    tmpMap.put(_Fields.PREV_STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("prev_status", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, TopologyStatus.class)));
+    tmpMap.put(_Fields.COMPONENT_DEBUG, new org.apache.storm.thrift.meta_data.FieldMetaData("component_debug", 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, DebugOptions.class))));
+    tmpMap.put(_Fields.PRINCIPAL, new org.apache.storm.thrift.meta_data.FieldMetaData("principal", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOPOLOGY_VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_version", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormBase.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormBase.class, metaDataMap);
   }
 
   public StormBase() {
@@ -338,16 +338,16 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
   }
 
   public void unset_num_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   public void set_num_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
   }
 
   public int get_component_executors_size() {
@@ -394,16 +394,16 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
   }
 
   public void unset_launch_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LAUNCH_TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __LAUNCH_TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field launch_time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_launch_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LAUNCH_TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __LAUNCH_TIME_SECS_ISSET_ID);
   }
 
   public void set_launch_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LAUNCH_TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __LAUNCH_TIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_owner() {
@@ -907,7 +907,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -917,7 +917,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -927,7 +927,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_num_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -937,7 +937,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_component_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_executors, other.component_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_executors, other.component_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -947,7 +947,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_launch_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.launch_time_secs, other.launch_time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.launch_time_secs, other.launch_time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -957,7 +957,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -967,7 +967,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_topology_action_options()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_action_options, other.topology_action_options);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_action_options, other.topology_action_options);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -977,7 +977,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_prev_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.prev_status, other.prev_status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.prev_status, other.prev_status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -987,7 +987,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_component_debug()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_debug, other.component_debug);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_debug, other.component_debug);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -997,7 +997,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_principal()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal, other.principal);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.principal, other.principal);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1007,7 +1007,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       return lastComparison;
     }
     if (is_set_topology_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_version, other.topology_version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_version, other.topology_version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1019,11 +1019,11 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
     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);
   }
 
@@ -1131,18 +1131,18 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
     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_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
     }
 
     if (!is_set_status()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
     }
 
     if (!is_set_num_workers()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1150,8 +1150,8 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
 
   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);
     }
   }
@@ -1160,58 +1160,58 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
     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 StormBaseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StormBaseStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StormBaseStandardScheme getScheme() {
       return new StormBaseStandardScheme();
     }
   }
 
-  private static class StormBaseStandardScheme extends org.apache.thrift.scheme.StandardScheme<StormBase> {
+  private static class StormBaseStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<StormBase> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, StormBase struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, StormBase 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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.status = org.apache.storm.generated.TopologyStatus.findByValue(iprot.readI32());
               struct.set_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 3: // NUM_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_workers = iprot.readI32();
               struct.set_num_workers_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: // COMPONENT_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map752 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map752 = iprot.readMapBegin();
                 struct.component_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map752.size);
                 java.lang.String _key753;
                 int _val754;
@@ -1225,46 +1225,46 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
               }
               struct.set_component_executors_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: // LAUNCH_TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.launch_time_secs = iprot.readI32();
               struct.set_launch_time_secs_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: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_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: // TOPOLOGY_ACTION_OPTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.topology_action_options = new TopologyActionOptions();
               struct.topology_action_options.read(iprot);
               struct.set_topology_action_options_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: // PREV_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.prev_status = org.apache.storm.generated.TopologyStatus.findByValue(iprot.readI32());
               struct.set_prev_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 9: // COMPONENT_DEBUG
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map756 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map756 = iprot.readMapBegin();
                 struct.component_debug = new java.util.HashMap<java.lang.String,DebugOptions>(2*_map756.size);
                 java.lang.String _key757;
                 DebugOptions _val758;
@@ -1279,27 +1279,27 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
               }
               struct.set_component_debug_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: // PRINCIPAL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.principal = iprot.readString();
               struct.set_principal_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 11: // TOPOLOGY_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_version = iprot.readString();
               struct.set_topology_version_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();
       }
@@ -1307,7 +1307,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, StormBase struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, StormBase struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1328,7 +1328,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
         if (struct.is_set_component_executors()) {
           oprot.writeFieldBegin(COMPONENT_EXECUTORS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.component_executors.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, struct.component_executors.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Integer> _iter760 : struct.component_executors.entrySet())
             {
               oprot.writeString(_iter760.getKey());
@@ -1369,7 +1369,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
         if (struct.is_set_component_debug()) {
           oprot.writeFieldBegin(COMPONENT_DEBUG_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.component_debug.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.component_debug.size()));
             for (java.util.Map.Entry<java.lang.String, DebugOptions> _iter761 : struct.component_debug.entrySet())
             {
               oprot.writeString(_iter761.getKey());
@@ -1400,17 +1400,17 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
 
   }
 
-  private static class StormBaseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class StormBaseTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public StormBaseTupleScheme getScheme() {
       return new StormBaseTupleScheme();
     }
   }
 
-  private static class StormBaseTupleScheme extends org.apache.thrift.scheme.TupleScheme<StormBase> {
+  private static class StormBaseTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<StormBase> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, StormBase 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, StormBase struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.name);
       oprot.writeI32(struct.status.getValue());
       oprot.writeI32(struct.num_workers);
@@ -1481,8 +1481,8 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, StormBase 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, StormBase struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.name = iprot.readString();
       struct.set_name_isSet(true);
       struct.status = org.apache.storm.generated.TopologyStatus.findByValue(iprot.readI32());
@@ -1492,7 +1492,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       java.util.BitSet incoming = iprot.readBitSet(8);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map764 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map764 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I32, iprot.readI32());
           struct.component_executors = new java.util.HashMap<java.lang.String,java.lang.Integer>(2*_map764.size);
           java.lang.String _key765;
           int _val766;
@@ -1524,7 +1524,7 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TMap _map768 = 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 _map768 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.component_debug = new java.util.HashMap<java.lang.String,DebugOptions>(2*_map768.size);
           java.lang.String _key769;
           DebugOptions _val770;
@@ -1549,8 +1549,8 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
     }
   }
 
-  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();
   }
 }
 


[03/50] [abbrv] storm git commit: Missed 2 files

Posted by bo...@apache.org.
Missed 2 files


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

Branch: refs/heads/master
Commit: a8eb4c40af8229f4737f7e5eef1534d5d0d12dfd
Parents: 8191e46
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 16 07:27:25 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:12 2018 -0500

----------------------------------------------------------------------
 .../storm/security/auth/ClientAuthUtils.java    | 529 +++++++++++++++++++
 .../security/auth/ClientAuthUtilsTest.java      | 224 ++++++++
 2 files changed, 753 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a8eb4c40/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java b/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
new file mode 100644
index 0000000..4f8fac8
--- /dev/null
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ClientAuthUtils.java
@@ -0,0 +1,529 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.storm.security.auth;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.URI;
+import java.security.MessageDigest;
+import java.security.URIParameter;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosTicket;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.storm.Config;
+import org.apache.storm.generated.WorkerToken;
+import org.apache.storm.generated.WorkerTokenInfo;
+import org.apache.storm.generated.WorkerTokenServiceType;
+import org.apache.storm.security.INimbusCredentialPlugin;
+import org.apache.storm.utils.ObjectReader;
+import org.apache.storm.utils.ReflectionUtils;
+import org.apache.storm.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClientAuthUtils {
+    public static final String LOGIN_CONTEXT_SERVER = "StormServer";
+    public static final String LOGIN_CONTEXT_CLIENT = "StormClient";
+    public static final String LOGIN_CONTEXT_PACEMAKER_DIGEST = "PacemakerDigest";
+    public static final String LOGIN_CONTEXT_PACEMAKER_SERVER = "PacemakerServer";
+    public static final String LOGIN_CONTEXT_PACEMAKER_CLIENT = "PacemakerClient";
+    public static final String SERVICE = "storm_thrift_server";
+    private static final Logger LOG = LoggerFactory.getLogger(ClientAuthUtils.class);
+    private static final String USERNAME = "username";
+    private static final String PASSWORD = "password";
+
+    /**
+     * Construct a JAAS configuration object per storm configuration file
+     *
+     * @param topoConf Storm configuration
+     * @return JAAS configuration object
+     */
+    public static Configuration getConfiguration(Map<String, Object> topoConf) {
+        Configuration login_conf = null;
+
+        //find login file configuration from Storm configuration
+        String loginConfigurationFile = (String) topoConf.get("java.security.auth.login.config");
+        if ((loginConfigurationFile != null) && (loginConfigurationFile.length() > 0)) {
+            File config_file = new File(loginConfigurationFile);
+            if (!config_file.canRead()) {
+                throw new RuntimeException("File " + loginConfigurationFile +
+                                           " cannot be read.");
+            }
+            try {
+                URI config_uri = config_file.toURI();
+                login_conf = Configuration.getInstance("JavaLoginConfig", new URIParameter(config_uri));
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+
+        return login_conf;
+    }
+
+    /**
+     * Get configurations for a section
+     *
+     * @param configuration The config to pull the key/value pairs out of.
+     * @param section       The app configuration entry name to get stuff from.
+     * @return Return array of config entries or null if configuration is null
+     */
+    public static AppConfigurationEntry[] getEntries(Configuration configuration,
+                                                     String section) throws IOException {
+        if (configuration == null) {
+            return null;
+        }
+
+        AppConfigurationEntry configurationEntries[] = configuration.getAppConfigurationEntry(section);
+        if (configurationEntries == null) {
+            String errorMessage = "Could not find a '" + section + "' entry in this configuration.";
+            throw new IOException(errorMessage);
+        }
+        return configurationEntries;
+    }
+
+    /**
+     * Pull a set of keys out of a Configuration.
+     *
+     * @param configuration The config to pull the key/value pairs out of.
+     * @param section       The app configuration entry name to get stuff from.
+     * @return Return a map of the configs in conf.
+     */
+    public static SortedMap<String, ?> pullConfig(Configuration configuration,
+                                                  String section) throws IOException {
+        AppConfigurationEntry[] configurationEntries = ClientAuthUtils.getEntries(configuration, section);
+
+        if (configurationEntries == null) {
+            return null;
+        }
+
+        TreeMap<String, Object> results = new TreeMap<>();
+
+        for (AppConfigurationEntry entry : configurationEntries) {
+            Map<String, ?> options = entry.getOptions();
+            for (String key : options.keySet()) {
+                results.put(key, options.get(key));
+            }
+        }
+
+        return results;
+    }
+
+    /**
+     * Pull a the value given section and key from Configuration
+     *
+     * @param configuration The config to pull the key/value pairs out of.
+     * @param section       The app configuration entry name to get stuff from.
+     * @param key           The key to look up inside of the section
+     * @return Return a the String value of the configuration value
+     */
+    public static String get(Configuration configuration, String section, String key) throws IOException {
+        AppConfigurationEntry[] configurationEntries = ClientAuthUtils.getEntries(configuration, section);
+
+        if (configurationEntries == null) {
+            return null;
+        }
+
+        for (AppConfigurationEntry entry : configurationEntries) {
+            Object val = entry.getOptions().get(key);
+            if (val != null) {
+                return (String) val;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Construct a principal to local plugin
+     *
+     * @param topoConf storm configuration
+     * @return the plugin
+     */
+    public static IPrincipalToLocal getPrincipalToLocalPlugin(Map<String, Object> topoConf) {
+        IPrincipalToLocal ptol = null;
+        try {
+            String ptol_klassName = (String) topoConf.get(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN);
+            if (ptol_klassName == null) {
+                LOG.warn("No principal to local given {}", Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN);
+            } else {
+                ptol = ReflectionUtils.newInstance(ptol_klassName);
+                //TODO this can only ever be null if someone is doing something odd with mocking
+                // We should really fix the mocking and remove this
+                if (ptol != null) {
+                    ptol.prepare(topoConf);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return ptol;
+    }
+
+    /**
+     * Construct a group mapping service provider plugin
+     *
+     * @param conf daemon configuration
+     * @return the plugin
+     */
+    public static IGroupMappingServiceProvider getGroupMappingServiceProviderPlugin(Map<String, Object> conf) {
+        IGroupMappingServiceProvider gmsp = null;
+        try {
+            String gmsp_klassName = (String) conf.get(Config.STORM_GROUP_MAPPING_SERVICE_PROVIDER_PLUGIN);
+            if (gmsp_klassName == null) {
+                LOG.warn("No group mapper given {}", Config.STORM_GROUP_MAPPING_SERVICE_PROVIDER_PLUGIN);
+            } else {
+                gmsp = ReflectionUtils.newInstance(gmsp_klassName);
+                if (gmsp != null) {
+                    gmsp.prepare(conf);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return gmsp;
+    }
+
+    /**
+     * Get all of the configured Credential Renewer Plugins.
+     *
+     * @param conf the storm configuration to use.
+     * @return the configured credential renewers.
+     */
+    public static Collection<ICredentialsRenewer> getCredentialRenewers(Map<String, Object> conf) {
+        try {
+            Set<ICredentialsRenewer> ret = new HashSet<>();
+            Collection<String> clazzes = (Collection<String>) conf.get(Config.NIMBUS_CREDENTIAL_RENEWERS);
+            if (clazzes != null) {
+                for (String clazz : clazzes) {
+                    ICredentialsRenewer inst = ReflectionUtils.newInstance(clazz);
+                    inst.prepare(conf);
+                    ret.add(inst);
+                }
+            }
+            return ret;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Get all the Nimbus Auto cred plugins.
+     *
+     * @param conf nimbus configuration to use.
+     * @return nimbus auto credential plugins.
+     */
+    public static Collection<INimbusCredentialPlugin> getNimbusAutoCredPlugins(Map<String, Object> conf) {
+        try {
+            Set<INimbusCredentialPlugin> ret = new HashSet<>();
+            Collection<String> clazzes = (Collection<String>) conf.get(Config.NIMBUS_AUTO_CRED_PLUGINS);
+            if (clazzes != null) {
+                for (String clazz : clazzes) {
+                    INimbusCredentialPlugin inst = ReflectionUtils.newInstance(clazz);
+                    inst.prepare(conf);
+                    ret.add(inst);
+                }
+            }
+            return ret;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Get all of the configured AutoCredential Plugins.
+     *
+     * @param topoConf the storm configuration to use.
+     * @return the configured auto credentials.
+     */
+    public static Collection<IAutoCredentials> getAutoCredentials(Map<String, Object> topoConf) {
+        try {
+            Set<IAutoCredentials> autos = new HashSet<>();
+            Collection<String> clazzes = (Collection<String>) topoConf.get(Config.TOPOLOGY_AUTO_CREDENTIALS);
+            if (clazzes != null) {
+                for (String clazz : clazzes) {
+                    IAutoCredentials a = ReflectionUtils.newInstance(clazz);
+                    a.prepare(topoConf);
+                    autos.add(a);
+                }
+            }
+            LOG.info("Got AutoCreds " + autos);
+            return autos;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Get the key used to store a WorkerToken in the credentials map
+     *
+     * @param type the type of service to get.
+     * @return the key as a String.
+     */
+    public static String workerTokenCredentialsKey(WorkerTokenServiceType type) {
+        return "STORM_WORKER_TOKEN_" + type.name();
+    }
+
+    /**
+     * Read a WorkerToken out of credentials for the given type.
+     *
+     * @param credentials the credentials map.
+     * @param type        the type of service we are looking for.
+     * @return the deserialized WorkerToken or null if none could be found.
+     */
+    public static WorkerToken readWorkerToken(Map<String, String> credentials, WorkerTokenServiceType type) {
+        WorkerToken ret = null;
+        String key = workerTokenCredentialsKey(type);
+        String tokenStr = credentials.get(key);
+        if (tokenStr != null) {
+            ret = Utils.deserializeFromString(tokenStr, WorkerToken.class);
+        }
+        return ret;
+    }
+
+    /**
+     * Store a worker token in some credentials. It can be pulled back out by calling readWorkerToken.
+     *
+     * @param credentials the credentials map.
+     * @param token       the token you want to store.
+     */
+    public static void setWorkerToken(Map<String, String> credentials, WorkerToken token) {
+        String key = workerTokenCredentialsKey(token.get_serviceType());
+        credentials.put(key, Utils.serializeToString(token));
+    }
+
+    /**
+     * Find a worker token in a given subject with a given token type.
+     *
+     * @param subject what to look in.
+     * @param type    the type of token to look for.
+     * @return the token or null.
+     */
+    public static WorkerToken findWorkerToken(Subject subject, final WorkerTokenServiceType type) {
+        Set<WorkerToken> creds = subject.getPrivateCredentials(WorkerToken.class);
+        synchronized (creds) {
+            return creds.stream()
+                        .filter((wt) ->
+                                    wt.get_serviceType() == type)
+                        .findAny().orElse(null);
+        }
+    }
+
+    private static boolean willWorkerTokensBeStoredSecurely(Map<String, Object> conf) {
+        boolean overrideZkAuth = ObjectReader.getBoolean(conf.get("TESTING.ONLY.ENABLE.INSECURE.WORKER.TOKENS"), false);
+        if (Utils.isZkAuthenticationConfiguredStormServer(conf)) {
+            return true;
+        } else if (overrideZkAuth) {
+            LOG.error("\n\n\t\tYOU HAVE ENABLED INSECURE WORKER TOKENS.  IF THIS IS NOT A UNIT TEST PLEASE STOP NOW!!!\n\n");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check if worker tokens should be enabled on the server side or not.
+     *
+     * @param server a Thrift server to know if the transport support tokens or not.  No need to create a token if the transport does not
+     *               support it.
+     * @param conf   the daemon configuration to be sure the tokens are secure.
+     * @return true if we can enable them, else false.
+     */
+    public static boolean areWorkerTokensEnabledServer(ThriftServer server, Map<String, Object> conf) {
+        return server.supportsWorkerTokens() && willWorkerTokensBeStoredSecurely(conf);
+    }
+
+    /**
+     * Check if worker tokens should be enabled on the server side or not (for a given server).
+     *
+     * @param connectionType the type of server this is for.
+     * @param conf           the daemon configuration to be sure the tokens are secure.
+     * @return true if we can enable them, else false.
+     */
+    public static boolean areWorkerTokensEnabledServer(ThriftConnectionType connectionType, Map<String, Object> conf) {
+        return connectionType.getWtType() != null && willWorkerTokensBeStoredSecurely(conf);
+    }
+
+    /**
+     * Turn a WorkerTokenInfo in a byte array.
+     *
+     * @param wti what to serialize.
+     * @return the resulting byte array.
+     */
+    public static byte[] serializeWorkerTokenInfo(WorkerTokenInfo wti) {
+        return Utils.serialize(wti);
+    }
+
+    /**
+     * Get and deserialize the WorkerTokenInfo in the worker token.
+     *
+     * @param wt the token.
+     * @return the deserialized info.
+     */
+    public static WorkerTokenInfo getWorkerTokenInfo(WorkerToken wt) {
+        return Utils.deserialize(wt.get_info(), WorkerTokenInfo.class);
+    }
+
+    //Support for worker tokens Similar to an IAutoCredentials implementation
+    private static Subject insertWorkerTokens(Subject subject, Map<String, String> credentials) {
+        if (credentials == null) {
+            return subject;
+        }
+        for (WorkerTokenServiceType type : WorkerTokenServiceType.values()) {
+            WorkerToken token = readWorkerToken(credentials, type);
+            if (token != null) {
+                Set<Object> creds = subject.getPrivateCredentials();
+                synchronized (creds) {
+                    WorkerToken previous = findWorkerToken(subject, type);
+                    creds.add(token);
+                    if (previous != null) {
+                        creds.remove(previous);
+                    }
+                }
+            }
+        }
+        return subject;
+    }
+
+    /**
+     * Populate a subject from credentials using the IAutoCredentials.
+     *
+     * @param subject     the subject to populate or null if a new Subject should be created.
+     * @param autos       the IAutoCredentials to call to populate the subject.
+     * @param credentials the credentials to pull from
+     * @return the populated subject.
+     */
+    public static Subject populateSubject(Subject subject, Collection<IAutoCredentials> autos, Map<String, String> credentials) {
+        try {
+            if (subject == null) {
+                subject = new Subject();
+            }
+            for (IAutoCredentials autoCred : autos) {
+                autoCred.populateSubject(subject, credentials);
+            }
+            return insertWorkerTokens(subject, credentials);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Update a subject from credentials using the IAutoCredentials.
+     *
+     * @param subject     the subject to update
+     * @param autos       the IAutoCredentials to call to update the subject.
+     * @param credentials the credentials to pull from
+     */
+    public static void updateSubject(Subject subject, Collection<IAutoCredentials> autos, Map<String, String> credentials) {
+        if (subject == null || autos == null) {
+            throw new RuntimeException("The subject or auto credentials cannot be null when updating a subject with credentials");
+        }
+
+        try {
+            for (IAutoCredentials autoCred : autos) {
+                autoCred.updateSubject(subject, credentials);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        insertWorkerTokens(subject, credentials);
+    }
+
+    /**
+     * Construct a transport plugin per storm configuration
+     */
+    public static ITransportPlugin getTransportPlugin(ThriftConnectionType type, Map<String, Object> topoConf, Configuration login_conf) {
+        try {
+            String transport_plugin_klassName = type.getTransportPlugin(topoConf);
+            ITransportPlugin transportPlugin = ReflectionUtils.newInstance(transport_plugin_klassName);
+            transportPlugin.prepare(type, topoConf, login_conf);
+            return transportPlugin;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String makeDigestPayload(Configuration login_config, String config_section) {
+        String username = null;
+        String password = null;
+        try {
+            Map<String, ?> results = ClientAuthUtils.pullConfig(login_config, config_section);
+            username = (String) results.get(USERNAME);
+            password = (String) results.get(PASSWORD);
+        } catch (Exception e) {
+            LOG.error("Failed to pull username/password out of jaas conf", e);
+        }
+
+        if (username == null || password == null) {
+            return null;
+        }
+
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-512");
+            byte[] output = digest.digest((username + ":" + password).getBytes());
+            return Hex.encodeHexString(output);
+        } catch (java.security.NoSuchAlgorithmException e) {
+            LOG.error("Cant run SHA-512 digest. Algorithm not available.", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static byte[] serializeKerberosTicket(KerberosTicket tgt) throws Exception {
+        ByteArrayOutputStream bao = new ByteArrayOutputStream();
+        ObjectOutputStream out = new ObjectOutputStream(bao);
+        out.writeObject(tgt);
+        out.flush();
+        out.close();
+        return bao.toByteArray();
+    }
+
+    public static KerberosTicket deserializeKerberosTicket(byte[] tgtBytes) {
+        KerberosTicket ret;
+        try {
+
+            ByteArrayInputStream bin = new ByteArrayInputStream(tgtBytes);
+            ObjectInputStream in = new ObjectInputStream(bin);
+            ret = (KerberosTicket) in.readObject();
+            in.close();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return ret;
+    }
+
+    public static KerberosTicket cloneKerberosTicket(KerberosTicket kerberosTicket) {
+        if (kerberosTicket != null) {
+            try {
+                return (deserializeKerberosTicket(serializeKerberosTicket(kerberosTicket)));
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to clone KerberosTicket TGT!!", e);
+            }
+        }
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/a8eb4c40/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
new file mode 100644
index 0000000..e7a9aca
--- /dev/null
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java
@@ -0,0 +1,224 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.storm.security.auth;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import javax.security.auth.Subject;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.storm.Config;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.mockito.Mockito;
+
+public class ClientAuthUtilsTest {
+
+    // JUnit ensures that the temporary folder is removed after
+    // the test finishes
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Test(expected = IOException.class)
+    public void getOptionsThrowsOnMissingSectionTest() throws IOException {
+        Configuration mockConfig = Mockito.mock(Configuration.class);
+        ClientAuthUtils.get(mockConfig, "bogus-section", "");
+    }
+
+    @Test
+    public void getNonExistentSectionTest() throws IOException {
+        Map<String, String> optionMap = new HashMap<String, String>();
+        AppConfigurationEntry entry = Mockito.mock(AppConfigurationEntry.class);
+
+        Mockito.<Map<String, ?>>when(entry.getOptions()).thenReturn(optionMap);
+        String section = "bogus-section";
+        Configuration mockConfig = Mockito.mock(Configuration.class);
+        Mockito.when(mockConfig.getAppConfigurationEntry(section))
+               .thenReturn(new AppConfigurationEntry[]{ entry });
+        Assert.assertNull(
+            ClientAuthUtils.get(mockConfig, section, "nonexistent-key"));
+    }
+
+    @Test
+    public void getFirstValueForValidKeyTest() throws IOException {
+        String k = "the-key";
+        String expected = "good-value";
+
+        Map<String, String> optionMap = new HashMap<String, String>();
+        optionMap.put(k, expected);
+
+        Map<String, String> badOptionMap = new HashMap<String, String>();
+        badOptionMap.put(k, "bad-value");
+
+        AppConfigurationEntry emptyEntry = Mockito.mock(AppConfigurationEntry.class);
+        AppConfigurationEntry badEntry = Mockito.mock(AppConfigurationEntry.class);
+        AppConfigurationEntry goodEntry = Mockito.mock(AppConfigurationEntry.class);
+
+        Mockito.<Map<String, ?>>when(emptyEntry.getOptions()).thenReturn(new HashMap<String, String>());
+        Mockito.<Map<String, ?>>when(badEntry.getOptions()).thenReturn(badOptionMap);
+        Mockito.<Map<String, ?>>when(goodEntry.getOptions()).thenReturn(optionMap);
+
+        String section = "bogus-section";
+        Configuration mockConfig = Mockito.mock(Configuration.class);
+        Mockito.when(mockConfig.getAppConfigurationEntry(section))
+               .thenReturn(new AppConfigurationEntry[]{ emptyEntry, goodEntry, badEntry });
+
+        Assert.assertEquals(
+            ClientAuthUtils.get(mockConfig, section, k), expected);
+    }
+
+    @Test
+    public void objGettersReturnNullWithNullConfigTest() throws IOException {
+        Assert.assertNull(ClientAuthUtils.pullConfig(null, "foo"));
+        Assert.assertNull(ClientAuthUtils.get(null, "foo", "bar"));
+
+        Assert.assertNull(ClientAuthUtils.getConfiguration(Collections.emptyMap()));
+    }
+
+    @Test
+    public void getAutoCredentialsTest() {
+        Map<String, Object> map = new HashMap<>();
+        map.put(Config.TOPOLOGY_AUTO_CREDENTIALS,
+                Arrays.asList(new String[]{ "org.apache.storm.security.auth.AuthUtilsTestMock" }));
+
+        Assert.assertTrue(ClientAuthUtils.getAutoCredentials(Collections.emptyMap()).isEmpty());
+        Assert.assertEquals(ClientAuthUtils.getAutoCredentials(map).size(), 1);
+    }
+
+    @Test
+    public void getNimbusAutoCredPluginTest() {
+        Map<String, Object> map = new HashMap<>();
+        map.put(Config.NIMBUS_AUTO_CRED_PLUGINS,
+                Arrays.asList(new String[]{ "org.apache.storm.security.auth.AuthUtilsTestMock" }));
+
+        Assert.assertTrue(ClientAuthUtils.getNimbusAutoCredPlugins(Collections.emptyMap()).isEmpty());
+        Assert.assertEquals(ClientAuthUtils.getNimbusAutoCredPlugins(map).size(), 1);
+    }
+
+    @Test
+    public void GetCredentialRenewersTest() {
+        Map<String, Object> map = new HashMap<>();
+        map.put(Config.NIMBUS_CREDENTIAL_RENEWERS,
+                Arrays.asList(new String[]{ "org.apache.storm.security.auth.AuthUtilsTestMock" }));
+
+        Assert.assertTrue(ClientAuthUtils.getCredentialRenewers(Collections.emptyMap()).isEmpty());
+        Assert.assertEquals(ClientAuthUtils.getCredentialRenewers(map).size(), 1);
+    }
+
+    @Test
+    public void populateSubjectTest() {
+        AuthUtilsTestMock autoCred = Mockito.mock(AuthUtilsTestMock.class);
+        Subject subject = new Subject();
+        Map<String, String> cred = new HashMap<String, String>();
+        Collection<IAutoCredentials> autos = Arrays.asList(new IAutoCredentials[]{ autoCred });
+        ClientAuthUtils.populateSubject(subject, autos, cred);
+        Mockito.verify(autoCred, Mockito.times(1)).populateSubject(subject, cred);
+    }
+
+    @Test
+    public void makeDigestPayloadTest() throws NoSuchAlgorithmException {
+        String section = "user-pass-section";
+        Map<String, String> optionMap = new HashMap<String, String>();
+        String user = "user";
+        String pass = "pass";
+        optionMap.put("username", user);
+        optionMap.put("password", pass);
+        AppConfigurationEntry entry = Mockito.mock(AppConfigurationEntry.class);
+
+        Mockito.<Map<String, ?>>when(entry.getOptions()).thenReturn(optionMap);
+        Configuration mockConfig = Mockito.mock(Configuration.class);
+        Mockito.when(mockConfig.getAppConfigurationEntry(section))
+               .thenReturn(new AppConfigurationEntry[]{ entry });
+
+        MessageDigest digest = MessageDigest.getInstance("SHA-512");
+        byte[] output = digest.digest((user + ":" + pass).getBytes());
+        String sha = Hex.encodeHexString(output);
+
+        // previous code used this method to generate the string, ensure the two match
+        StringBuilder builder = new StringBuilder();
+        for (byte b : output) {
+            builder.append(String.format("%02x", b));
+        }
+        String stringFormatMethod = builder.toString();
+
+        Assert.assertEquals(
+            ClientAuthUtils.makeDigestPayload(mockConfig, "user-pass-section"),
+            sha);
+
+        Assert.assertEquals(sha, stringFormatMethod);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void invalidConfigResultsInIOException() throws RuntimeException {
+        HashMap<String, Object> conf = new HashMap<>();
+        conf.put("java.security.auth.login.config", "__FAKE_FILE__");
+        Assert.assertNotNull(ClientAuthUtils.getConfiguration(conf));
+    }
+
+    @Test
+    public void validConfigResultsInNotNullConfigurationTest() throws IOException {
+        File file1 = folder.newFile("mockfile.txt");
+        HashMap<String, Object> conf = new HashMap<>();
+        conf.put("java.security.auth.login.config", file1.getAbsolutePath());
+        Assert.assertNotNull(ClientAuthUtils.getConfiguration(conf));
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void updateSubjectWithNullThrowsTest() {
+        ClientAuthUtils.updateSubject(null, null, null);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void updateSubjectWithNullAutosThrowsTest() {
+        ClientAuthUtils.updateSubject(new Subject(), null, null);
+    }
+
+    @Test
+    public void updateSubjectWithNullAutosTest() {
+        AuthUtilsTestMock mock = Mockito.mock(AuthUtilsTestMock.class);
+        Collection<IAutoCredentials> autos = Arrays.asList(new IAutoCredentials[]{ mock });
+        Subject s = new Subject();
+        ClientAuthUtils.updateSubject(s, autos, null);
+        Mockito.verify(mock, Mockito.times(1)).updateSubject(s, null);
+    }
+
+    @Test
+    public void uiHttpCredentialsPluginTest() {
+        Map<String, Object> conf = new HashMap<>();
+        conf.put(
+            Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN, AuthUtilsTestMock.class.getName());
+        conf.put(
+            Config.STORM_GROUP_MAPPING_SERVICE_PROVIDER_PLUGIN, AuthUtilsTestMock.class.getName());
+
+        Assert.assertTrue(
+            ClientAuthUtils.getPrincipalToLocalPlugin(conf).getClass() == AuthUtilsTestMock.class);
+        Assert.assertTrue(
+            ClientAuthUtils.getGroupMappingServiceProviderPlugin(conf).getClass() == AuthUtilsTestMock.class);
+    }
+}


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
index e4ea4d8..86f4d94 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
@@ -25,29 +25,29 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)4);
-  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.MAP, (short)6);
-  private static final org.apache.thrift.protocol.TField COMPONENT_DEBUG_FIELD_DESC = new org.apache.thrift.protocol.TField("component_debug", org.apache.thrift.protocol.TType.MAP, (short)7);
-  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)8);
-  private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)513);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)514);
-  private static final org.apache.thrift.protocol.TField REPLICATION_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("replication_count", org.apache.thrift.protocol.TType.I32, (short)515);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)521);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)522);
-  private static final org.apache.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)523);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)524);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)525);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)526);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyInfoTupleSchemeFactory();
+public class TopologyInfo implements org.apache.storm.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("TopologyInfo");
+
+  private static final org.apache.storm.thrift.protocol.TField ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executors", org.apache.storm.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("status", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("errors", org.apache.storm.thrift.protocol.TType.MAP, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_DEBUG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_debug", org.apache.storm.thrift.protocol.TType.MAP, (short)7);
+  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)8);
+  private static final org.apache.storm.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("sched_status", org.apache.storm.thrift.protocol.TType.STRING, (short)513);
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)514);
+  private static final org.apache.storm.thrift.protocol.TField REPLICATION_COUNT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("replication_count", org.apache.storm.thrift.protocol.TType.I32, (short)515);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)521);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)522);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)523);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)524);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)525);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)526);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyInfoTupleSchemeFactory();
 
   private java.lang.String id; // required
   private java.lang.String name; // required
@@ -68,7 +68,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   private double assigned_cpu; // 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 {
     ID((short)1, "id"),
     NAME((short)2, "name"),
     UPTIME_SECS((short)3, "uptime_secs"),
@@ -184,51 +184,51 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   private static final int __ASSIGNED_CPU_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.COMPONENT_DEBUG,_Fields.STORM_VERSION,_Fields.SCHED_STATUS,_Fields.OWNER,_Fields.REPLICATION_COUNT,_Fields.REQUESTED_MEMONHEAP,_Fields.REQUESTED_MEMOFFHEAP,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_MEMONHEAP,_Fields.ASSIGNED_MEMOFFHEAP,_Fields.ASSIGNED_CPU};
-  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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, ExecutorSummary.class))));
-    tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", 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.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ErrorInfo.class)))));
-    tmpMap.put(_Fields.COMPONENT_DEBUG, new org.apache.thrift.meta_data.FieldMetaData("component_debug", 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, DebugOptions.class))));
-    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.SCHED_STATUS, new org.apache.thrift.meta_data.FieldMetaData("sched_status", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.REPLICATION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("replication_count", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.ID, new org.apache.storm.thrift.meta_data.FieldMetaData("id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("executors", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorSummary.class))));
+    tmpMap.put(_Fields.STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("status", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ERRORS, new org.apache.storm.thrift.meta_data.FieldMetaData("errors", 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.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+                new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ErrorInfo.class)))));
+    tmpMap.put(_Fields.COMPONENT_DEBUG, new org.apache.storm.thrift.meta_data.FieldMetaData("component_debug", 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, DebugOptions.class))));
+    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.SCHED_STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("sched_status", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.REPLICATION_COUNT, new org.apache.storm.thrift.meta_data.FieldMetaData("replication_count", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyInfo.class, metaDataMap);
   }
 
   public TopologyInfo() {
@@ -414,16 +414,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public int get_executors_size() {
@@ -634,16 +634,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_replication_count() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   /** Returns true if field replication_count is set (has been assigned a value) and false otherwise */
   public boolean is_set_replication_count() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   public void set_replication_count_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
   }
 
   public double get_requested_memonheap() {
@@ -656,16 +656,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_requested_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_requested_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_requested_memoffheap() {
@@ -678,16 +678,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_requested_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_requested_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_requested_cpu() {
@@ -700,16 +700,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_requested_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   public void set_requested_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
   }
 
   public double get_assigned_memonheap() {
@@ -722,16 +722,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_assigned_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_assigned_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_memoffheap() {
@@ -744,16 +744,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_assigned_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_assigned_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_cpu() {
@@ -766,16 +766,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
   }
 
   public void unset_assigned_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   /** Returns true if field assigned_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   public void set_assigned_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -1240,27 +1240,27 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
 
     hashCode = hashCode * 8191 + ((is_set_requested_memonheap()) ? 131071 : 524287);
     if (is_set_requested_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_memoffheap()) ? 131071 : 524287);
     if (is_set_requested_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287);
     if (is_set_requested_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memonheap()) ? 131071 : 524287);
     if (is_set_assigned_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memoffheap()) ? 131071 : 524287);
     if (is_set_assigned_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_cpu()) ? 131071 : 524287);
     if (is_set_assigned_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_cpu);
 
     return hashCode;
   }
@@ -1278,7 +1278,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id, other.id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1288,7 +1288,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1298,7 +1298,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1308,7 +1308,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executors, other.executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1318,7 +1318,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1328,7 +1328,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_errors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, other.errors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.errors, other.errors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1338,7 +1338,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_component_debug()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_debug, other.component_debug);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_debug, other.component_debug);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1348,7 +1348,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       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;
       }
@@ -1358,7 +1358,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_sched_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1368,7 +1368,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1378,7 +1378,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_replication_count()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_count, other.replication_count);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.replication_count, other.replication_count);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1388,7 +1388,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_requested_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1398,7 +1398,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_requested_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1408,7 +1408,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_requested_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1418,7 +1418,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_assigned_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1428,7 +1428,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_assigned_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1438,7 +1438,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       return lastComparison;
     }
     if (is_set_assigned_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1450,11 +1450,11 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
     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);
   }
 
@@ -1592,30 +1592,30 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
     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_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
     }
 
     if (!is_set_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
     }
 
     if (!is_set_uptime_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_executors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
     }
 
     if (!is_set_status()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
     }
 
     if (!is_set_errors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'errors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'errors' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1623,8 +1623,8 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
 
   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);
     }
   }
@@ -1633,58 +1633,58 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
     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 TopologyInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyInfoStandardScheme getScheme() {
       return new TopologyInfoStandardScheme();
     }
   }
 
-  private static class TopologyInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TopologyInfo> {
+  private static class TopologyInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<TopologyInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, TopologyInfo 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: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.id = iprot.readString();
               struct.set_id_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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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: // EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list360 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list360 = iprot.readListBegin();
                 struct.executors = new java.util.ArrayList<ExecutorSummary>(_list360.size);
                 ExecutorSummary _elem361;
                 for (int _i362 = 0; _i362 < _list360.size; ++_i362)
@@ -1697,21 +1697,21 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
               }
               struct.set_executors_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: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.status = iprot.readString();
               struct.set_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 6: // ERRORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map363 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map363 = iprot.readMapBegin();
                 struct.errors = new java.util.HashMap<java.lang.String,java.util.List<ErrorInfo>>(2*_map363.size);
                 java.lang.String _key364;
                 java.util.List<ErrorInfo> _val365;
@@ -1719,7 +1719,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
                 {
                   _key364 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TList _list367 = iprot.readListBegin();
+                    org.apache.storm.thrift.protocol.TList _list367 = iprot.readListBegin();
                     _val365 = new java.util.ArrayList<ErrorInfo>(_list367.size);
                     ErrorInfo _elem368;
                     for (int _i369 = 0; _i369 < _list367.size; ++_i369)
@@ -1736,13 +1736,13 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
               }
               struct.set_errors_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: // COMPONENT_DEBUG
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map370 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map370 = iprot.readMapBegin();
                 struct.component_debug = new java.util.HashMap<java.lang.String,DebugOptions>(2*_map370.size);
                 java.lang.String _key371;
                 DebugOptions _val372;
@@ -1757,91 +1757,91 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
               }
               struct.set_component_debug_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: // 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 513: // SCHED_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.sched_status = iprot.readString();
               struct.set_sched_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 514: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 515: // REPLICATION_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.replication_count = iprot.readI32();
               struct.set_replication_count_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 521: // REQUESTED_MEMONHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_memonheap = iprot.readDouble();
               struct.set_requested_memonheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 522: // REQUESTED_MEMOFFHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_memoffheap = iprot.readDouble();
               struct.set_requested_memoffheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 523: // REQUESTED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_cpu = iprot.readDouble();
               struct.set_requested_cpu_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 524: // ASSIGNED_MEMONHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_memonheap = iprot.readDouble();
               struct.set_assigned_memonheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 525: // ASSIGNED_MEMOFFHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_memoffheap = iprot.readDouble();
               struct.set_assigned_memoffheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 526: // ASSIGNED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_cpu = iprot.readDouble();
               struct.set_assigned_cpu_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();
       }
@@ -1849,7 +1849,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, TopologyInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1869,7 +1869,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       if (struct.executors != null) {
         oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.executors.size()));
           for (ExecutorSummary _iter374 : struct.executors)
           {
             _iter374.write(oprot);
@@ -1886,12 +1886,12 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       if (struct.errors != null) {
         oprot.writeFieldBegin(ERRORS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.errors.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.LIST, struct.errors.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.List<ErrorInfo>> _iter375 : struct.errors.entrySet())
           {
             oprot.writeString(_iter375.getKey());
             {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter375.getValue().size()));
+              oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, _iter375.getValue().size()));
               for (ErrorInfo _iter376 : _iter375.getValue())
               {
                 _iter376.write(oprot);
@@ -1907,7 +1907,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
         if (struct.is_set_component_debug()) {
           oprot.writeFieldBegin(COMPONENT_DEBUG_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.component_debug.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.component_debug.size()));
             for (java.util.Map.Entry<java.lang.String, DebugOptions> _iter377 : struct.component_debug.entrySet())
             {
               oprot.writeString(_iter377.getKey());
@@ -1980,17 +1980,17 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
 
   }
 
-  private static class TopologyInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyInfoTupleScheme getScheme() {
       return new TopologyInfoTupleScheme();
     }
   }
 
-  private static class TopologyInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TopologyInfo> {
+  private static class TopologyInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<TopologyInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TopologyInfo 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, TopologyInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.id);
       oprot.writeString(struct.name);
       oprot.writeI32(struct.uptime_secs);
@@ -2094,8 +2094,8 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TopologyInfo 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, TopologyInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.id = iprot.readString();
       struct.set_id_isSet(true);
       struct.name = iprot.readString();
@@ -2103,7 +2103,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       struct.uptime_secs = iprot.readI32();
       struct.set_uptime_secs_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list382 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list382 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.executors = new java.util.ArrayList<ExecutorSummary>(_list382.size);
         ExecutorSummary _elem383;
         for (int _i384 = 0; _i384 < _list382.size; ++_i384)
@@ -2117,7 +2117,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       struct.status = iprot.readString();
       struct.set_status_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map385 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map385 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.LIST, iprot.readI32());
         struct.errors = new java.util.HashMap<java.lang.String,java.util.List<ErrorInfo>>(2*_map385.size);
         java.lang.String _key386;
         java.util.List<ErrorInfo> _val387;
@@ -2125,7 +2125,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
         {
           _key386 = iprot.readString();
           {
-            org.apache.thrift.protocol.TList _list389 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.storm.thrift.protocol.TList _list389 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
             _val387 = new java.util.ArrayList<ErrorInfo>(_list389.size);
             ErrorInfo _elem390;
             for (int _i391 = 0; _i391 < _list389.size; ++_i391)
@@ -2142,7 +2142,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
       java.util.BitSet incoming = iprot.readBitSet(11);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map392 = 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 _map392 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.component_debug = new java.util.HashMap<java.lang.String,DebugOptions>(2*_map392.size);
           java.lang.String _key393;
           DebugOptions _val394;
@@ -2199,8 +2199,8 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
     }
   }
 
-  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/TopologyInitialStatus.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java
index c393179..4bd3322 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum TopologyInitialStatus implements org.apache.thrift.TEnum {
+public enum TopologyInitialStatus implements org.apache.storm.thrift.TEnum {
   ACTIVE(1),
   INACTIVE(2);
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/NimbusSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/NimbusSummary.java b/storm-client/src/jvm/org/apache/storm/generated/NimbusSummary.java
index cc7f95c..ec233d9 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/NimbusSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/NimbusSummary.java
@@ -25,17 +25,17 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, NimbusSummary._Fields>, java.io.Serializable, Cloneable, Comparable<NimbusSummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NimbusSummary");
+public class NimbusSummary implements org.apache.storm.thrift.TBase<NimbusSummary, NimbusSummary._Fields>, java.io.Serializable, Cloneable, Comparable<NimbusSummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("NimbusSummary");
 
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField IS_LEADER_FIELD_DESC = new org.apache.thrift.protocol.TField("isLeader", org.apache.thrift.protocol.TType.BOOL, (short)4);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("host", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField IS_LEADER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("isLeader", org.apache.storm.thrift.protocol.TType.BOOL, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("version", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NimbusSummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NimbusSummaryTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NimbusSummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NimbusSummaryTupleSchemeFactory();
 
   private java.lang.String host; // required
   private int port; // required
@@ -44,7 +44,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
   private java.lang.String version; // 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 {
     HOST((short)1, "host"),
     PORT((short)2, "port"),
     UPTIME_SECS((short)3, "uptime_secs"),
@@ -118,21 +118,21 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
   private static final int __UPTIME_SECS_ISSET_ID = 1;
   private static final int __ISLEADER_ISSET_ID = 2;
   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.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.IS_LEADER, new org.apache.thrift.meta_data.FieldMetaData("isLeader", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("host", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.IS_LEADER, new org.apache.storm.thrift.meta_data.FieldMetaData("isLeader", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("version", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NimbusSummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NimbusSummary.class, metaDataMap);
   }
 
   public NimbusSummary() {
@@ -221,16 +221,16 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
   }
 
   public void unset_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -243,16 +243,16 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public boolean is_isLeader() {
@@ -265,16 +265,16 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
   }
 
   public void unset_isLeader() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISLEADER_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISLEADER_ISSET_ID);
   }
 
   /** Returns true if field isLeader is set (has been assigned a value) and false otherwise */
   public boolean is_set_isLeader() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISLEADER_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ISLEADER_ISSET_ID);
   }
 
   public void set_isLeader_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISLEADER_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ISLEADER_ISSET_ID, value);
   }
 
   public java.lang.String get_version() {
@@ -484,7 +484,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
       return lastComparison;
     }
     if (is_set_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -494,7 +494,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -504,7 +504,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -514,7 +514,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
       return lastComparison;
     }
     if (is_set_isLeader()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isLeader, other.isLeader);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.isLeader, other.isLeader);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -524,7 +524,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
       return lastComparison;
     }
     if (is_set_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.version, other.version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -536,11 +536,11 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
     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);
   }
 
@@ -580,26 +580,26 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
     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_host()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
     }
 
     if (!is_set_port()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
     }
 
     if (!is_set_uptime_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_isLeader()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'isLeader' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'isLeader' is unset! Struct:" + toString());
     }
 
     if (!is_set_version()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -607,8 +607,8 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
 
   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);
     }
   }
@@ -617,72 +617,72 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
     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 NimbusSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NimbusSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NimbusSummaryStandardScheme getScheme() {
       return new NimbusSummaryStandardScheme();
     }
   }
 
-  private static class NimbusSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<NimbusSummary> {
+  private static class NimbusSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<NimbusSummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, NimbusSummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, NimbusSummary 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: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.host = iprot.readString();
               struct.set_host_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.port = iprot.readI32();
               struct.set_port_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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: // IS_LEADER
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.BOOL) {
               struct.isLeader = iprot.readBool();
               struct.set_isLeader_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: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.version = iprot.readString();
               struct.set_version_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();
       }
@@ -690,7 +690,7 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, NimbusSummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, NimbusSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -719,17 +719,17 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
 
   }
 
-  private static class NimbusSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NimbusSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NimbusSummaryTupleScheme getScheme() {
       return new NimbusSummaryTupleScheme();
     }
   }
 
-  private static class NimbusSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<NimbusSummary> {
+  private static class NimbusSummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<NimbusSummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, NimbusSummary 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, NimbusSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.host);
       oprot.writeI32(struct.port);
       oprot.writeI32(struct.uptime_secs);
@@ -738,8 +738,8 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, NimbusSummary 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, NimbusSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.host = iprot.readString();
       struct.set_host_isSet(true);
       struct.port = iprot.readI32();
@@ -753,8 +753,8 @@ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, Nim
     }
   }
 
-  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/NodeInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java b/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java
index 88cfe14..0f68ac1 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.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 NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo");
+public class NodeInfo implements org.apache.storm.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("NodeInfo");
 
-  private static final org.apache.thrift.protocol.TField NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("node", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.SET, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NODE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("node", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.SET, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NodeInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NodeInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NodeInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NodeInfoTupleSchemeFactory();
 
   private java.lang.String node; // required
   private java.util.Set<java.lang.Long> port; // 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 {
     NODE((short)1, "node"),
     PORT((short)2, "port");
 
@@ -99,16 +99,16 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
   }
 
   // isset id assignments
-  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.NODE, new org.apache.thrift.meta_data.FieldMetaData("node", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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.I64))));
+    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.NODE, new org.apache.storm.thrift.meta_data.FieldMetaData("node", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        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.I64))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NodeInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NodeInfo.class, metaDataMap);
   }
 
   public NodeInfo() {
@@ -319,7 +319,7 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
       return lastComparison;
     }
     if (is_set_node()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.node, other.node);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.node, other.node);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -329,7 +329,7 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -341,11 +341,11 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
     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);
   }
 
@@ -373,14 +373,14 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
     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_node()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'node' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'node' is unset! Struct:" + toString());
     }
 
     if (!is_set_port()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'port' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -388,50 +388,50 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
 
   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 NodeInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NodeInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NodeInfoStandardScheme getScheme() {
       return new NodeInfoStandardScheme();
     }
   }
 
-  private static class NodeInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<NodeInfo> {
+  private static class NodeInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<NodeInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, NodeInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, NodeInfo 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: // NODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.node = iprot.readString();
               struct.set_node_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.SET) {
               {
-                org.apache.thrift.protocol.TSet _set658 = iprot.readSetBegin();
+                org.apache.storm.thrift.protocol.TSet _set658 = iprot.readSetBegin();
                 struct.port = new java.util.HashSet<java.lang.Long>(2*_set658.size);
                 long _elem659;
                 for (int _i660 = 0; _i660 < _set658.size; ++_i660)
@@ -443,11 +443,11 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
               }
               struct.set_port_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();
       }
@@ -455,7 +455,7 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, NodeInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, NodeInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -467,7 +467,7 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
       if (struct.port != null) {
         oprot.writeFieldBegin(PORT_FIELD_DESC);
         {
-          oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.port.size()));
+          oprot.writeSetBegin(new org.apache.storm.thrift.protocol.TSet(org.apache.storm.thrift.protocol.TType.I64, struct.port.size()));
           for (long _iter661 : struct.port)
           {
             oprot.writeI64(_iter661);
@@ -482,17 +482,17 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
 
   }
 
-  private static class NodeInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NodeInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NodeInfoTupleScheme getScheme() {
       return new NodeInfoTupleScheme();
     }
   }
 
-  private static class NodeInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<NodeInfo> {
+  private static class NodeInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<NodeInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, NodeInfo 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, NodeInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.node);
       {
         oprot.writeI32(struct.port.size());
@@ -504,12 +504,12 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, NodeInfo 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, NodeInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.node = iprot.readString();
       struct.set_node_isSet(true);
       {
-        org.apache.thrift.protocol.TSet _set663 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+        org.apache.storm.thrift.protocol.TSet _set663 = new org.apache.storm.thrift.protocol.TSet(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
         struct.port = new java.util.HashSet<java.lang.Long>(2*_set663.size);
         long _elem664;
         for (int _i665 = 0; _i665 < _set663.size; ++_i665)
@@ -522,8 +522,8 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
     }
   }
 
-  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/NotAliveException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/NotAliveException.java b/storm-client/src/jvm/org/apache/storm/generated/NotAliveException.java
index 733f4c9..f1949c8 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/NotAliveException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/NotAliveException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class NotAliveException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<NotAliveException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotAliveException");
+public class NotAliveException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<NotAliveException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("NotAliveException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NotAliveExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NotAliveExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NotAliveExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NotAliveExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class NotAliveException extends org.apache.thrift.TException implements o
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotAliveException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotAliveException.class, metaDataMap);
   }
 
   public NotAliveException() {
@@ -240,7 +240,7 @@ public class NotAliveException extends org.apache.thrift.TException implements o
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class NotAliveException extends org.apache.thrift.TException implements o
     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);
   }
 
@@ -276,10 +276,10 @@ public class NotAliveException extends org.apache.thrift.TException implements o
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class NotAliveException extends org.apache.thrift.TException implements o
 
   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 NotAliveExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NotAliveExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NotAliveExceptionStandardScheme getScheme() {
       return new NotAliveExceptionStandardScheme();
     }
   }
 
-  private static class NotAliveExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotAliveException> {
+  private static class NotAliveExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<NotAliveException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, NotAliveException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, NotAliveException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class NotAliveException extends org.apache.thrift.TException implements o
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, NotAliveException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, NotAliveException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class NotAliveException extends org.apache.thrift.TException implements o
 
   }
 
-  private static class NotAliveExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NotAliveExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NotAliveExceptionTupleScheme getScheme() {
       return new NotAliveExceptionTupleScheme();
     }
   }
 
-  private static class NotAliveExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<NotAliveException> {
+  private static class NotAliveExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<NotAliveException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, NotAliveException 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, NotAliveException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, NotAliveException 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, NotAliveException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/NullStruct.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/NullStruct.java b/storm-client/src/jvm/org/apache/storm/generated/NullStruct.java
index e89f71b..a449c6e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/NullStruct.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/NullStruct.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable, Comparable<NullStruct> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NullStruct");
+public class NullStruct implements org.apache.storm.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable, Comparable<NullStruct> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("NullStruct");
 
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NullStructStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NullStructTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NullStructStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NullStructTupleSchemeFactory();
 
 
   /** 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 {
 ;
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -88,11 +88,11 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
       return _fieldName;
     }
   }
-  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);
+    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);
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NullStruct.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NullStruct.class, metaDataMap);
   }
 
   public NullStruct() {
@@ -174,11 +174,11 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
     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);
   }
 
@@ -191,47 +191,47 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 NullStructStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NullStructStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NullStructStandardScheme getScheme() {
       return new NullStructStandardScheme();
     }
   }
 
-  private static class NullStructStandardScheme extends org.apache.thrift.scheme.StandardScheme<NullStruct> {
+  private static class NullStructStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<NullStruct> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, NullStruct struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, NullStruct 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) {
           default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
         iprot.readFieldEnd();
       }
@@ -239,7 +239,7 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, NullStruct struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, NullStruct struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -249,27 +249,27 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
 
   }
 
-  private static class NullStructTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class NullStructTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public NullStructTupleScheme getScheme() {
       return new NullStructTupleScheme();
     }
   }
 
-  private static class NullStructTupleScheme extends org.apache.thrift.scheme.TupleScheme<NullStruct> {
+  private static class NullStructTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<NullStruct> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, NullStruct 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, NullStruct struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, NullStruct 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, NullStruct struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
     }
   }
 
-  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/NumErrorsChoice.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java b/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java
index bdafbab..08359f3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum NumErrorsChoice implements org.apache.thrift.TEnum {
+public enum NumErrorsChoice implements org.apache.storm.thrift.TEnum {
   ALL(0),
   NONE(1),
   ONE(2);


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

Posted by bo...@apache.org.
STORM-2882: thrift


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/91251c54
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/91251c54
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/91251c54

Branch: refs/heads/master
Commit: 91251c54abdb5bc267851dcf38a1cfcea247eaad
Parents: 142ad60
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 30 10:37:55 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 .../st/tests/window/SlidingWindowTest.java      |    11 +-
 .../apache/storm/st/wrapper/StormCluster.java   |    17 +-
 .../org/apache/storm/st/wrapper/TopoWrap.java   |    53 +-
 shaded-deps/pom.xml                             |    26 +
 storm-client/pom.xml                            |    21 -
 storm-client/src/genthrift.sh                   |     2 +-
 .../src/jvm/org/apache/storm/ILocalCluster.java |     2 +-
 .../jvm/org/apache/storm/StormSubmitter.java    |     2 +-
 .../apache/storm/blobstore/NimbusBlobStore.java |     2 +-
 .../storm/drpc/DRPCInvocationsClient.java       |     4 +-
 .../jvm/org/apache/storm/drpc/DRPCSpout.java    |     2 +-
 .../org/apache/storm/drpc/ReturnResults.java    |     5 +-
 .../apache/storm/generated/AccessControl.java   |   106 +-
 .../storm/generated/AccessControlType.java      |     2 +-
 .../storm/generated/AlreadyAliveException.java  |    74 +-
 .../org/apache/storm/generated/Assignment.java  |   212 +-
 .../storm/generated/AuthorizationException.java |    74 +-
 .../storm/generated/BeginDownloadResult.java    |   116 +-
 .../jvm/org/apache/storm/generated/Bolt.java    |    88 +-
 .../storm/generated/BoltAggregateStats.java     |   140 +-
 .../org/apache/storm/generated/BoltStats.java   |   230 +-
 .../apache/storm/generated/ClusterSummary.java  |   144 +-
 .../storm/generated/ClusterWorkerHeartbeat.java |   138 +-
 .../storm/generated/CommonAggregateStats.java   |   198 +-
 .../generated/ComponentAggregateStats.java      |   108 +-
 .../apache/storm/generated/ComponentCommon.java |   138 +-
 .../apache/storm/generated/ComponentObject.java |    74 +-
 .../storm/generated/ComponentPageInfo.java      |   334 +-
 .../apache/storm/generated/ComponentType.java   |     2 +-
 .../org/apache/storm/generated/Credentials.java |    84 +-
 .../storm/generated/DRPCExceptionType.java      |     2 +-
 .../storm/generated/DRPCExecutionException.java |    86 +-
 .../org/apache/storm/generated/DRPCRequest.java |    88 +-
 .../apache/storm/generated/DebugOptions.java    |    98 +-
 .../apache/storm/generated/DistributedRPC.java  |   286 +-
 .../generated/DistributedRPCInvocations.java    |   904 +-
 .../org/apache/storm/generated/ErrorInfo.java   |   124 +-
 .../storm/generated/ExecutorAggregateStats.java |    84 +-
 .../apache/storm/generated/ExecutorInfo.java    |   100 +-
 .../storm/generated/ExecutorSpecificStats.java  |    62 +-
 .../apache/storm/generated/ExecutorStats.java   |   164 +-
 .../apache/storm/generated/ExecutorSummary.java |   154 +-
 .../apache/storm/generated/GetInfoOptions.java  |    72 +-
 .../apache/storm/generated/GlobalStreamId.java  |    88 +-
 .../org/apache/storm/generated/Grouping.java    |   124 +-
 .../generated/HBAuthorizationException.java     |    74 +-
 .../storm/generated/HBExecutionException.java   |    74 +-
 .../org/apache/storm/generated/HBMessage.java   |   102 +-
 .../apache/storm/generated/HBMessageData.java   |    98 +-
 .../jvm/org/apache/storm/generated/HBNodes.java |    80 +-
 .../jvm/org/apache/storm/generated/HBPulse.java |    98 +-
 .../org/apache/storm/generated/HBRecords.java   |    80 +-
 .../storm/generated/HBServerMessageType.java    |     2 +-
 .../generated/InvalidTopologyException.java     |    74 +-
 .../org/apache/storm/generated/JavaObject.java  |    96 +-
 .../apache/storm/generated/JavaObjectArg.java   |    98 +-
 .../generated/KeyAlreadyExistsException.java    |    74 +-
 .../storm/generated/KeyNotFoundException.java   |    74 +-
 .../org/apache/storm/generated/KillOptions.java |    78 +-
 .../storm/generated/LSApprovedWorkers.java      |    84 +-
 .../generated/LSSupervisorAssignments.java      |    84 +-
 .../apache/storm/generated/LSSupervisorId.java  |    74 +-
 .../apache/storm/generated/LSTopoHistory.java   |   140 +-
 .../storm/generated/LSTopoHistoryList.java      |    82 +-
 .../storm/generated/LSWorkerHeartbeat.java      |   136 +-
 .../apache/storm/generated/ListBlobsResult.java |    96 +-
 .../apache/storm/generated/LocalAssignment.java |   140 +-
 .../apache/storm/generated/LocalStateData.java  |    84 +-
 .../org/apache/storm/generated/LogConfig.java   |    82 +-
 .../org/apache/storm/generated/LogLevel.java    |   136 +-
 .../apache/storm/generated/LogLevelAction.java  |     2 +-
 .../jvm/org/apache/storm/generated/Nimbus.java  | 11668 ++++++++---------
 .../apache/storm/generated/NimbusSummary.java   |   148 +-
 .../org/apache/storm/generated/NodeInfo.java    |    96 +-
 .../storm/generated/NotAliveException.java      |    74 +-
 .../org/apache/storm/generated/NullStruct.java  |    60 +-
 .../apache/storm/generated/NumErrorsChoice.java |     2 +-
 .../storm/generated/OwnerResourceSummary.java   |   408 +-
 .../storm/generated/PrivateWorkerKey.java       |   122 +-
 .../apache/storm/generated/ProfileAction.java   |     2 +-
 .../apache/storm/generated/ProfileRequest.java  |   108 +-
 .../storm/generated/ReadableBlobMeta.java       |    96 +-
 .../storm/generated/RebalanceOptions.java       |   174 +-
 .../storm/generated/SettableBlobMeta.java       |   100 +-
 .../apache/storm/generated/SharedMemory.java    |   134 +-
 .../apache/storm/generated/ShellComponent.java  |    84 +-
 .../storm/generated/SpecificAggregateStats.java |    62 +-
 .../storm/generated/SpoutAggregateStats.java    |    80 +-
 .../org/apache/storm/generated/SpoutSpec.java   |    88 +-
 .../org/apache/storm/generated/SpoutStats.java  |   162 +-
 .../apache/storm/generated/StateSpoutSpec.java  |    88 +-
 .../org/apache/storm/generated/StormBase.java   |   234 +-
 .../apache/storm/generated/StormTopology.java   |   274 +-
 .../org/apache/storm/generated/StreamInfo.java  |   102 +-
 .../apache/storm/generated/SubmitOptions.java   |    86 +-
 .../org/apache/storm/generated/Supervisor.java  |   686 +-
 .../storm/generated/SupervisorAssignments.java  |    82 +-
 .../apache/storm/generated/SupervisorInfo.java  |   246 +-
 .../storm/generated/SupervisorPageInfo.java     |   100 +-
 .../storm/generated/SupervisorSummary.java      |   266 +-
 .../generated/SupervisorWorkerHeartbeat.java    |   116 +-
 .../generated/SupervisorWorkerHeartbeats.java   |    96 +-
 .../storm/generated/ThriftSerializedObject.java |   100 +-
 .../storm/generated/TopologyActionOptions.java  |    62 +-
 .../storm/generated/TopologyHistoryInfo.java    |    80 +-
 .../apache/storm/generated/TopologyInfo.java    |   376 +-
 .../storm/generated/TopologyInitialStatus.java  |     2 +-
 .../storm/generated/TopologyPageInfo.java       |   620 +-
 .../apache/storm/generated/TopologyStats.java   |   170 +-
 .../apache/storm/generated/TopologyStatus.java  |     2 +-
 .../apache/storm/generated/TopologySummary.java |   372 +-
 .../storm/generated/WorkerMetricList.java       |    80 +-
 .../storm/generated/WorkerMetricPoint.java      |   160 +-
 .../apache/storm/generated/WorkerMetrics.java   |   122 +-
 .../apache/storm/generated/WorkerResources.java |   204 +-
 .../apache/storm/generated/WorkerSummary.java   |   326 +-
 .../org/apache/storm/generated/WorkerToken.java |   126 +-
 .../apache/storm/generated/WorkerTokenInfo.java |   132 +-
 .../storm/generated/WorkerTokenServiceType.java |     2 +-
 .../storm/security/auth/ITransportPlugin.java   |    10 +-
 .../security/auth/SimpleTransportPlugin.java    |    24 +-
 .../storm/security/auth/TBackoffConnect.java    |     4 +-
 .../storm/security/auth/ThriftClient.java       |     8 +-
 .../storm/security/auth/ThriftServer.java       |     6 +-
 .../auth/digest/DigestSaslTransportPlugin.java  |    10 +-
 .../kerberos/KerberosSaslTransportPlugin.java   |    10 +-
 .../security/auth/kerberos/NoOpTTrasport.java   |     6 +-
 .../auth/plain/PlainSaslTransportPlugin.java    |    10 +-
 .../security/auth/sasl/SaslTransportPlugin.java |    24 +-
 .../GzipThriftSerializationDelegate.java        |     8 +-
 .../ThriftSerializationDelegate.java            |     8 +-
 .../trident/drpc/ReturnResultsReducer.java      |     5 +-
 .../apache/storm/trident/util/TridentUtils.java |     2 +-
 .../jvm/org/apache/storm/utils/DRPCClient.java  |     4 +-
 .../jvm/org/apache/storm/utils/LocalState.java  |     6 +-
 .../org/apache/storm/utils/NimbusClient.java    |     2 +-
 .../apache/storm/utils/SupervisorClient.java    |     2 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |     8 +-
 .../storm/security/auth/ThriftClientTest.java   |     2 +-
 .../jvm/org/apache/storm/utils/UtilsTest.java   |     2 +-
 .../src/clj/org/apache/storm/thrift.clj         |     2 +-
 .../ILocalClusterTrackedTopologyAware.java      |     2 +-
 .../java/org/apache/storm/LocalCluster.java     |     4 +-
 .../main/java/org/apache/storm/LocalDRPC.java   |     2 +-
 .../src/main/java/org/apache/storm/Testing.java |     2 +-
 .../apache/storm/blobstore/BlobStoreUtils.java  |     2 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |     4 +-
 .../storm/daemon/supervisor/Supervisor.java     |     4 +-
 .../timer/ReportWorkerHeartbeats.java           |     2 +-
 .../timer/SynchronizeAssignments.java           |     2 +-
 .../apache/storm/localizer/AsyncLocalizer.java  |     2 +-
 .../metricstore/NimbusMetricProcessor.java      |     2 +-
 .../nimbus/NimbusHeartbeatsPressureTest.java    |     4 +-
 .../org/apache/storm/utils/ServerUtils.java     |     5 +-
 .../java/org/apache/storm/TestRebalance.java    |     2 +-
 .../apache/storm/security/auth/AuthTest.java    |    15 +-
 .../storm/daemon/drpc/webapp/DRPCResource.java  |     2 +-
 157 files changed, 13137 insertions(+), 13149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
index 83b981e..6add83a 100644
--- a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
+++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java
@@ -18,16 +18,18 @@
 package org.apache.storm.st.tests.window;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.List;
 import org.apache.storm.st.helper.AbstractTest;
-import org.apache.storm.st.wrapper.LogData;
-import org.apache.storm.st.wrapper.TopoWrap;
-import org.apache.thrift.TException;
 import org.apache.storm.st.topology.TestableTopology;
 import org.apache.storm.st.topology.window.SlidingTimeCorrectness;
 import org.apache.storm.st.topology.window.SlidingWindowCorrectness;
 import org.apache.storm.st.topology.window.data.TimeData;
 import org.apache.storm.st.topology.window.data.TimeDataWindow;
 import org.apache.storm.st.utils.TimeUtil;
+import org.apache.storm.st.wrapper.LogData;
+import org.apache.storm.st.wrapper.TopoWrap;
+import org.apache.storm.thrift.TException;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
@@ -37,9 +39,6 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import java.net.MalformedURLException;
-import java.util.List;
-
 public final class SlidingWindowTest extends AbstractTest {
     private static Logger log = LoggerFactory.getLogger(SlidingWindowTest.class);
     private TopoWrap topo;

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
index f8e59f5..716c37d 100644
--- a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
+++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
@@ -19,27 +19,26 @@ package org.apache.storm.st.wrapper;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.storm.generated.ClusterSummary;
 import org.apache.storm.generated.KillOptions;
 import org.apache.storm.generated.Nimbus;
 import org.apache.storm.generated.TopologyInfo;
 import org.apache.storm.generated.TopologySummary;
 import org.apache.storm.st.utils.AssertUtil;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 public class StormCluster {
     private static Logger log = LoggerFactory.getLogger(StormCluster.class);
     private final Nimbus.Iface client;

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
----------------------------------------------------------------------
diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
index 52b8646..ef1494e 100644
--- a/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
+++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/TopoWrap.java
@@ -22,33 +22,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import org.apache.storm.generated.AlreadyAliveException;
-import org.apache.storm.generated.AuthorizationException;
-import org.apache.storm.generated.ComponentAggregateStats;
-import org.apache.storm.generated.ComponentPageInfo;
-import org.apache.storm.generated.ExecutorAggregateStats;
-import org.apache.storm.generated.ExecutorStats;
-import org.apache.storm.generated.ExecutorSummary;
-import org.apache.storm.generated.InvalidTopologyException;
-import org.apache.storm.generated.StormTopology;
-import org.apache.storm.generated.TopologyInfo;
-import org.apache.storm.generated.TopologySummary;
-import org.apache.storm.st.utils.AssertUtil;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.storm.StormSubmitter;
-import org.apache.thrift.TException;
-import org.apache.storm.st.topology.window.data.FromJson;
-import org.apache.storm.st.utils.StringDecorator;
-import org.apache.storm.st.utils.TimeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -66,8 +39,34 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.storm.Config;
+import org.apache.storm.StormSubmitter;
+import org.apache.storm.generated.AlreadyAliveException;
+import org.apache.storm.generated.AuthorizationException;
+import org.apache.storm.generated.ComponentAggregateStats;
+import org.apache.storm.generated.ComponentPageInfo;
+import org.apache.storm.generated.ExecutorAggregateStats;
+import org.apache.storm.generated.ExecutorStats;
+import org.apache.storm.generated.ExecutorSummary;
+import org.apache.storm.generated.InvalidTopologyException;
+import org.apache.storm.generated.StormTopology;
+import org.apache.storm.generated.TopologyInfo;
+import org.apache.storm.generated.TopologySummary;
+import org.apache.storm.st.topology.window.data.FromJson;
+import org.apache.storm.st.utils.AssertUtil;
+import org.apache.storm.st.utils.StringDecorator;
+import org.apache.storm.st.utils.TimeUtil;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 
 public class TopoWrap {
     private static Logger log = LoggerFactory.getLogger(TopoWrap.class);

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 7d71dc2..9cbe139 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -105,6 +105,25 @@
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -134,14 +153,21 @@
                             <include>commons-lang:commons-lang</include>
                             <include>io.netty:netty</include>
                             <include>org.apache.curator:*</include>
+                            <include>org.apache.thrift:*</include>
                             <include>org.apache.zookeeper:zookeeper</include>
                             <include>org.jctools:jctools-core</include>
                             <include>org.jgrapht:jgrapht-core</include>
                             <include>org.yaml:snakeyaml</include>
+
                         </includes>
                     </artifactSet>
                     <relocations>
                         <relocation>
+                            <pattern>org.apache.thrift</pattern>
+                            <!-- This pattern is inconsistent for backwards compatibility purposes. -->
+                            <shadedPattern>org.apache.storm.thrift</shadedPattern>
+                        </relocation>
+                        <relocation>
                             <pattern>com.google.common</pattern>
                             <shadedPattern>org.apache.storm.shade.com.google.common</shadedPattern>
                         </relocation>

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 9c68e9b..c5004a9 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -73,27 +73,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- thrift -->
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- kryo -->
         <dependency>
             <groupId>com.esotericsoftware</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/genthrift.sh
----------------------------------------------------------------------
diff --git a/storm-client/src/genthrift.sh b/storm-client/src/genthrift.sh
index c63bf44..cb9d9a3 100644
--- a/storm-client/src/genthrift.sh
+++ b/storm-client/src/genthrift.sh
@@ -19,7 +19,7 @@ rm -rf gen-javabean gen-py py
 rm -rf jvm/org/apache/storm/generated
 thrift --gen java:beans,nocamel,generated_annotations=undated --gen py:utf8strings storm.thrift
 for file in gen-javabean/org/apache/storm/generated/* ; do
-  cat java_license_header.txt ${file} > ${file}.tmp
+  cat java_license_header.txt ${file} | sed -e 's/org\.apache\.thrift/org.apache.storm.thrift/g' > ${file}.tmp
   mv -f ${file}.tmp ${file}
 done
 cat py_license_header.txt gen-py/__init__.py > gen-py/__init__.py.tmp

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/ILocalCluster.java b/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
index b442ed2..1c420de 100644
--- a/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
+++ b/storm-client/src/jvm/org/apache/storm/ILocalCluster.java
@@ -21,7 +21,7 @@ import org.apache.storm.generated.RebalanceOptions;
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.generated.SubmitOptions;
 import org.apache.storm.generated.TopologyInfo;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
 
 /**
  * This is here mostly for backwards compatibility.

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
index 15cfc11..37eb40c 100644
--- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
+++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
@@ -46,7 +46,7 @@ import org.apache.storm.utils.BufferFileInputStream;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.validation.ConfigValidation;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
index fd58062..8b8a549 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
@@ -25,9 +25,9 @@ import org.apache.storm.generated.KeyNotFoundException;
 import org.apache.storm.generated.ListBlobsResult;
 import org.apache.storm.generated.ReadableBlobMeta;
 import org.apache.storm.generated.SettableBlobMeta;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.ObjectReader;
-import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
index 86ed655..e30549b 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
@@ -20,8 +20,8 @@ import org.apache.storm.generated.DRPCRequest;
 import org.apache.storm.generated.DistributedRPCInvocations;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
index 703a6c1..f8b6bc7 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
@@ -37,6 +37,7 @@ import org.apache.storm.generated.DistributedRPCInvocations;
 import org.apache.storm.shade.org.json.simple.JSONValue;
 import org.apache.storm.spout.SpoutOutputCollector;
 import org.apache.storm.task.TopologyContext;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.topology.OutputFieldsDeclarer;
 import org.apache.storm.topology.base.BaseRichSpout;
 import org.apache.storm.tuple.Fields;
@@ -45,7 +46,6 @@ import org.apache.storm.utils.DRPCClient;
 import org.apache.storm.utils.ExtendedThreadPoolExecutor;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ServiceRegistry;
-import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
index a829be9..cb0aaa8 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
@@ -23,17 +23,16 @@ import org.apache.storm.shade.org.json.simple.JSONValue;
 import org.apache.storm.shade.org.json.simple.parser.ParseException;
 import org.apache.storm.task.OutputCollector;
 import org.apache.storm.task.TopologyContext;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.topology.OutputFieldsDeclarer;
 import org.apache.storm.topology.base.BaseRichBolt;
 import org.apache.storm.tuple.Tuple;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ServiceRegistry;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class ReturnResults extends BaseRichBolt {
     public static final Logger LOG = LoggerFactory.getLogger(ReturnResults.class);
     //ANY CHANGE TO THIS CODE MUST BE SERIALIZABLE COMPATIBLE OR THERE WILL BE PROBLEMS

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
index 58e8e27..bef3f32 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AccessControl.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControl.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 AccessControl implements org.apache.thrift.TBase<AccessControl, AccessControl._Fields>, java.io.Serializable, Cloneable, Comparable<AccessControl> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccessControl");
+public class AccessControl implements org.apache.storm.thrift.TBase<AccessControl, AccessControl._Fields>, java.io.Serializable, Cloneable, Comparable<AccessControl> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AccessControl");
 
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("access", org.apache.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("type", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField ACCESS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("access", org.apache.storm.thrift.protocol.TType.I32, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AccessControlStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AccessControlTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AccessControlStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AccessControlTupleSchemeFactory();
 
   private AccessControlType type; // required
   private java.lang.String name; // optional
   private int access; // 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 {
     /**
      * 
      * @see AccessControlType
@@ -111,17 +111,17 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
   private static final int __ACCESS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.NAME};
-  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.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AccessControlType.class)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ACCESS, new org.apache.thrift.meta_data.FieldMetaData("access", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("type", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, AccessControlType.class)));
+    tmpMap.put(_Fields.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ACCESS, new org.apache.storm.thrift.meta_data.FieldMetaData("access", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AccessControl.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AccessControl.class, metaDataMap);
   }
 
   public AccessControl() {
@@ -227,16 +227,16 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
   }
 
   public void unset_access() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACCESS_ISSET_ID);
   }
 
   /** Returns true if field access is set (has been assigned a value) and false otherwise */
   public boolean is_set_access() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ACCESS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ACCESS_ISSET_ID);
   }
 
   public void set_access_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ACCESS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -375,7 +375,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
       return lastComparison;
     }
     if (is_set_type()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -385,7 +385,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -395,7 +395,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
       return lastComparison;
     }
     if (is_set_access()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.access, other.access);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.access, other.access);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -407,11 +407,11 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
     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);
   }
 
@@ -445,14 +445,14 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
     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_type()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'type' is unset! Struct:" + toString());
     }
 
     if (!is_set_access()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'access' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'access' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -460,8 +460,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
 
   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);
     }
   }
@@ -470,56 +470,56 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
     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 AccessControlStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AccessControlStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AccessControlStandardScheme getScheme() {
       return new AccessControlStandardScheme();
     }
   }
 
-  private static class AccessControlStandardScheme extends org.apache.thrift.scheme.StandardScheme<AccessControl> {
+  private static class AccessControlStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AccessControl> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, AccessControl struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AccessControl 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: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.type = org.apache.storm.generated.AccessControlType.findByValue(iprot.readI32());
               struct.set_type_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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // ACCESS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.access = iprot.readI32();
               struct.set_access_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();
       }
@@ -527,7 +527,7 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, AccessControl struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AccessControl struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -552,17 +552,17 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
 
   }
 
-  private static class AccessControlTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AccessControlTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AccessControlTupleScheme getScheme() {
       return new AccessControlTupleScheme();
     }
   }
 
-  private static class AccessControlTupleScheme extends org.apache.thrift.scheme.TupleScheme<AccessControl> {
+  private static class AccessControlTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<AccessControl> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, AccessControl 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, AccessControl struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI32(struct.type.getValue());
       oprot.writeI32(struct.access);
       java.util.BitSet optionals = new java.util.BitSet();
@@ -576,8 +576,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, AccessControl 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, AccessControl struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.type = org.apache.storm.generated.AccessControlType.findByValue(iprot.readI32());
       struct.set_type_isSet(true);
       struct.access = iprot.readI32();
@@ -590,8 +590,8 @@ public class AccessControl implements org.apache.thrift.TBase<AccessControl, Acc
     }
   }
 
-  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/AccessControlType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java b/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
index 159dffa..0f2f3d4 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AccessControlType.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum AccessControlType implements org.apache.thrift.TEnum {
+public enum AccessControlType implements org.apache.storm.thrift.TEnum {
   OTHER(1),
   USER(2);
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
index 6a43897..c1d6bb5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class AlreadyAliveException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException");
+public class AlreadyAliveException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AlreadyAliveException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AlreadyAliveExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AlreadyAliveExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AlreadyAliveExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AlreadyAliveExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap);
   }
 
   public AlreadyAliveException() {
@@ -240,7 +240,7 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
     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);
   }
 
@@ -276,10 +276,10 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
 
   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 AlreadyAliveExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AlreadyAliveExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AlreadyAliveExceptionStandardScheme getScheme() {
       return new AlreadyAliveExceptionStandardScheme();
     }
   }
 
-  private static class AlreadyAliveExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<AlreadyAliveException> {
+  private static class AlreadyAliveExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AlreadyAliveException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AlreadyAliveException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class AlreadyAliveException extends org.apache.thrift.TException implemen
 
   }
 
-  private static class AlreadyAliveExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AlreadyAliveExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AlreadyAliveExceptionTupleScheme getScheme() {
       return new AlreadyAliveExceptionTupleScheme();
     }
   }
 
-  private static class AlreadyAliveExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<AlreadyAliveException> {
+  private static class AlreadyAliveExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<AlreadyAliveException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException 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, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException 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, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
index 8de602d..f7aa2b5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
@@ -25,23 +25,23 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary");
-
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_used_workers", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)6);
-  private static final org.apache.thrift.protocol.TField TOTAL_RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("total_resources", org.apache.thrift.protocol.TType.MAP, (short)7);
-  private static final org.apache.thrift.protocol.TField USED_MEM_FIELD_DESC = new org.apache.thrift.protocol.TField("used_mem", org.apache.thrift.protocol.TType.DOUBLE, (short)8);
-  private static final org.apache.thrift.protocol.TField USED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("used_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)9);
-  private static final org.apache.thrift.protocol.TField FRAGMENTED_MEM_FIELD_DESC = new org.apache.thrift.protocol.TField("fragmented_mem", org.apache.thrift.protocol.TType.DOUBLE, (short)10);
-  private static final org.apache.thrift.protocol.TField FRAGMENTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("fragmented_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)11);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorSummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorSummaryTupleSchemeFactory();
+public class SupervisorSummary implements org.apache.storm.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SupervisorSummary");
+
+  private static final org.apache.storm.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("host", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_workers", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_used_workers", org.apache.storm.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("supervisor_id", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("version", org.apache.storm.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_RESOURCES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_resources", org.apache.storm.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField USED_MEM_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("used_mem", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField USED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("used_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField FRAGMENTED_MEM_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("fragmented_mem", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)10);
+  private static final org.apache.storm.thrift.protocol.TField FRAGMENTED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("fragmented_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)11);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorSummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorSummaryTupleSchemeFactory();
 
   private java.lang.String host; // required
   private int uptime_secs; // required
@@ -56,7 +56,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   private double fragmented_cpu; // 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 {
     HOST((short)1, "host"),
     UPTIME_SECS((short)2, "uptime_secs"),
     NUM_WORKERS((short)3, "num_workers"),
@@ -153,35 +153,35 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   private static final int __FRAGMENTED_CPU_ISSET_ID = 6;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.VERSION,_Fields.TOTAL_RESOURCES,_Fields.USED_MEM,_Fields.USED_CPU,_Fields.FRAGMENTED_MEM,_Fields.FRAGMENTED_CPU};
-  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.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_USED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_used_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOTAL_RESOURCES, new org.apache.thrift.meta_data.FieldMetaData("total_resources", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
-    tmpMap.put(_Fields.USED_MEM, new org.apache.thrift.meta_data.FieldMetaData("used_mem", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.USED_CPU, new org.apache.thrift.meta_data.FieldMetaData("used_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.FRAGMENTED_MEM, new org.apache.thrift.meta_data.FieldMetaData("fragmented_mem", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.FRAGMENTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("fragmented_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("host", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_workers", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_USED_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_used_workers", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("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.TOTAL_RESOURCES, new org.apache.storm.thrift.meta_data.FieldMetaData("total_resources", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
+    tmpMap.put(_Fields.USED_MEM, new org.apache.storm.thrift.meta_data.FieldMetaData("used_mem", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.USED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("used_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.FRAGMENTED_MEM, new org.apache.storm.thrift.meta_data.FieldMetaData("fragmented_mem", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.FRAGMENTED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("fragmented_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap);
   }
 
   public SupervisorSummary() {
@@ -294,16 +294,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public int get_num_workers() {
@@ -316,16 +316,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_num_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   public void set_num_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
   }
 
   public int get_num_used_workers() {
@@ -338,16 +338,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_num_used_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_used_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_used_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID);
   }
 
   public void set_num_used_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID, value);
   }
 
   public java.lang.String get_supervisor_id() {
@@ -440,16 +440,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_used_mem() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USED_MEM_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __USED_MEM_ISSET_ID);
   }
 
   /** Returns true if field used_mem is set (has been assigned a value) and false otherwise */
   public boolean is_set_used_mem() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USED_MEM_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __USED_MEM_ISSET_ID);
   }
 
   public void set_used_mem_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USED_MEM_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __USED_MEM_ISSET_ID, value);
   }
 
   public double get_used_cpu() {
@@ -462,16 +462,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_used_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __USED_CPU_ISSET_ID);
   }
 
   /** Returns true if field used_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_used_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __USED_CPU_ISSET_ID);
   }
 
   public void set_used_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __USED_CPU_ISSET_ID, value);
   }
 
   public double get_fragmented_mem() {
@@ -484,16 +484,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_fragmented_mem() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID);
   }
 
   /** Returns true if field fragmented_mem is set (has been assigned a value) and false otherwise */
   public boolean is_set_fragmented_mem() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID);
   }
 
   public void set_fragmented_mem_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID, value);
   }
 
   public double get_fragmented_cpu() {
@@ -506,16 +506,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
   }
 
   public void unset_fragmented_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field fragmented_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_fragmented_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID);
   }
 
   public void set_fragmented_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -828,19 +828,19 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
 
     hashCode = hashCode * 8191 + ((is_set_used_mem()) ? 131071 : 524287);
     if (is_set_used_mem())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(used_mem);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(used_mem);
 
     hashCode = hashCode * 8191 + ((is_set_used_cpu()) ? 131071 : 524287);
     if (is_set_used_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(used_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(used_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_fragmented_mem()) ? 131071 : 524287);
     if (is_set_fragmented_mem())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fragmented_mem);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(fragmented_mem);
 
     hashCode = hashCode * 8191 + ((is_set_fragmented_cpu()) ? 131071 : 524287);
     if (is_set_fragmented_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fragmented_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(fragmented_cpu);
 
     return hashCode;
   }
@@ -858,7 +858,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -868,7 +868,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -878,7 +878,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_num_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -888,7 +888,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_num_used_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_used_workers, other.num_used_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_used_workers, other.num_used_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -898,7 +898,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_supervisor_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -908,7 +908,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.version, other.version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -918,7 +918,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_total_resources()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_resources, other.total_resources);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_resources, other.total_resources);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -928,7 +928,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_used_mem()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.used_mem, other.used_mem);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.used_mem, other.used_mem);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -938,7 +938,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_used_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.used_cpu, other.used_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.used_cpu, other.used_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -948,7 +948,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_fragmented_mem()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fragmented_mem, other.fragmented_mem);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.fragmented_mem, other.fragmented_mem);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -958,7 +958,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       return lastComparison;
     }
     if (is_set_fragmented_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fragmented_cpu, other.fragmented_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.fragmented_cpu, other.fragmented_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -970,11 +970,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
     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);
   }
 
@@ -1058,26 +1058,26 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
     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_host()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
     }
 
     if (!is_set_uptime_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_num_workers()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString());
     }
 
     if (!is_set_num_used_workers()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_used_workers' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'num_used_workers' is unset! Struct:" + toString());
     }
 
     if (!is_set_supervisor_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1085,8 +1085,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
 
   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);
     }
   }
@@ -1095,82 +1095,82 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
     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 SupervisorSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorSummaryStandardScheme getScheme() {
       return new SupervisorSummaryStandardScheme();
     }
   }
 
-  private static class SupervisorSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorSummary> {
+  private static class SupervisorSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SupervisorSummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorSummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SupervisorSummary 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: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.host = iprot.readString();
               struct.set_host_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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: // NUM_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_workers = iprot.readI32();
               struct.set_num_workers_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: // NUM_USED_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_used_workers = iprot.readI32();
               struct.set_num_used_workers_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: // SUPERVISOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.supervisor_id = iprot.readString();
               struct.set_supervisor_id_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: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.version = iprot.readString();
               struct.set_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 7: // TOTAL_RESOURCES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map126 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map126 = iprot.readMapBegin();
                 struct.total_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map126.size);
                 java.lang.String _key127;
                 double _val128;
@@ -1184,43 +1184,43 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
               }
               struct.set_total_resources_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: // USED_MEM
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.used_mem = iprot.readDouble();
               struct.set_used_mem_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: // USED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.used_cpu = iprot.readDouble();
               struct.set_used_cpu_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: // FRAGMENTED_MEM
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.fragmented_mem = iprot.readDouble();
               struct.set_fragmented_mem_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 11: // FRAGMENTED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.fragmented_cpu = iprot.readDouble();
               struct.set_fragmented_cpu_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();
       }
@@ -1228,7 +1228,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorSummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SupervisorSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1262,7 +1262,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
         if (struct.is_set_total_resources()) {
           oprot.writeFieldBegin(TOTAL_RESOURCES_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.total_resources.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.total_resources.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter130 : struct.total_resources.entrySet())
             {
               oprot.writeString(_iter130.getKey());
@@ -1299,17 +1299,17 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
 
   }
 
-  private static class SupervisorSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorSummaryTupleScheme getScheme() {
       return new SupervisorSummaryTupleScheme();
     }
   }
 
-  private static class SupervisorSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorSummary> {
+  private static class SupervisorSummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SupervisorSummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary 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, SupervisorSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.host);
       oprot.writeI32(struct.uptime_secs);
       oprot.writeI32(struct.num_workers);
@@ -1363,8 +1363,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary 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, SupervisorSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.host = iprot.readString();
       struct.set_host_isSet(true);
       struct.uptime_secs = iprot.readI32();
@@ -1382,7 +1382,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map132 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map132 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.total_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map132.size);
           java.lang.String _key133;
           double _val134;
@@ -1414,8 +1414,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
     }
   }
 
-  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/SupervisorWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.java
index caa12af..020faf7 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.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 SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<SupervisorWorkerHeartbeat, SupervisorWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorWorkerHeartbeat> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorWorkerHeartbeat");
+public class SupervisorWorkerHeartbeat implements org.apache.storm.thrift.TBase<SupervisorWorkerHeartbeat, SupervisorWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorWorkerHeartbeat> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SupervisorWorkerHeartbeat");
 
-  private static final org.apache.thrift.protocol.TField STORM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storm_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)2);
-  private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField STORM_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("storm_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executors", org.apache.storm.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_secs", org.apache.storm.thrift.protocol.TType.I32, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorWorkerHeartbeatStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorWorkerHeartbeatTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorWorkerHeartbeatStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorWorkerHeartbeatTupleSchemeFactory();
 
   private java.lang.String storm_id; // required
   private java.util.List<ExecutorInfo> executors; // required
   private int time_secs; // 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 {
     STORM_ID((short)1, "storm_id"),
     EXECUTORS((short)2, "executors"),
     TIME_SECS((short)3, "time_secs");
@@ -106,18 +106,18 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
   // isset id assignments
   private static final int __TIME_SECS_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.STORM_ID, new org.apache.thrift.meta_data.FieldMetaData("storm_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, ExecutorInfo.class))));
-    tmpMap.put(_Fields.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.STORM_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("storm_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("executors", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorInfo.class))));
+    tmpMap.put(_Fields.TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("time_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorWorkerHeartbeat.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorWorkerHeartbeat.class, metaDataMap);
   }
 
   public SupervisorWorkerHeartbeat() {
@@ -236,16 +236,16 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
   }
 
   public void unset_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   public void set_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -384,7 +384,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
       return lastComparison;
     }
     if (is_set_storm_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storm_id, other.storm_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.storm_id, other.storm_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -394,7 +394,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
       return lastComparison;
     }
     if (is_set_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executors, other.executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -404,7 +404,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
       return lastComparison;
     }
     if (is_set_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -416,11 +416,11 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
     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);
   }
 
@@ -452,18 +452,18 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
     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_storm_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'storm_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'storm_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_executors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
     }
 
     if (!is_set_time_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -471,8 +471,8 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
 
   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);
     }
   }
@@ -481,42 +481,42 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
     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 SupervisorWorkerHeartbeatStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorWorkerHeartbeatStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorWorkerHeartbeatStandardScheme getScheme() {
       return new SupervisorWorkerHeartbeatStandardScheme();
     }
   }
 
-  private static class SupervisorWorkerHeartbeatStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorWorkerHeartbeat> {
+  private static class SupervisorWorkerHeartbeatStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SupervisorWorkerHeartbeat> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorWorkerHeartbeat struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SupervisorWorkerHeartbeat 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: // STORM_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.storm_id = iprot.readString();
               struct.set_storm_id_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: // EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list870 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list870 = iprot.readListBegin();
                 struct.executors = new java.util.ArrayList<ExecutorInfo>(_list870.size);
                 ExecutorInfo _elem871;
                 for (int _i872 = 0; _i872 < _list870.size; ++_i872)
@@ -529,19 +529,19 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
               }
               struct.set_executors_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: // TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.time_secs = iprot.readI32();
               struct.set_time_secs_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();
       }
@@ -549,7 +549,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorWorkerHeartbeat struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SupervisorWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -561,7 +561,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
       if (struct.executors != null) {
         oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.executors.size()));
           for (ExecutorInfo _iter873 : struct.executors)
           {
             _iter873.write(oprot);
@@ -579,17 +579,17 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
 
   }
 
-  private static class SupervisorWorkerHeartbeatTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorWorkerHeartbeatTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorWorkerHeartbeatTupleScheme getScheme() {
       return new SupervisorWorkerHeartbeatTupleScheme();
     }
   }
 
-  private static class SupervisorWorkerHeartbeatTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorWorkerHeartbeat> {
+  private static class SupervisorWorkerHeartbeatTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SupervisorWorkerHeartbeat> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkerHeartbeat 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, SupervisorWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.storm_id);
       {
         oprot.writeI32(struct.executors.size());
@@ -602,12 +602,12 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkerHeartbeat 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, SupervisorWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.storm_id = iprot.readString();
       struct.set_storm_id_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list875 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list875 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.executors = new java.util.ArrayList<ExecutorInfo>(_list875.size);
         ExecutorInfo _elem876;
         for (int _i877 = 0; _i877 < _list875.size; ++_i877)
@@ -623,8 +623,8 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv
     }
   }
 
-  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/SupervisorWorkerHeartbeats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeats.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeats.java
index bc10f7f..45eeabc 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeats.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 SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<SupervisorWorkerHeartbeats, SupervisorWorkerHeartbeats._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorWorkerHeartbeats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorWorkerHeartbeats");
+public class SupervisorWorkerHeartbeats implements org.apache.storm.thrift.TBase<SupervisorWorkerHeartbeats, SupervisorWorkerHeartbeats._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorWorkerHeartbeats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SupervisorWorkerHeartbeats");
 
-  private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField WORKER_HEARTBEATS_FIELD_DESC = new org.apache.thrift.protocol.TField("worker_heartbeats", org.apache.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("supervisor_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField WORKER_HEARTBEATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("worker_heartbeats", org.apache.storm.thrift.protocol.TType.LIST, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorWorkerHeartbeatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorWorkerHeartbeatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorWorkerHeartbeatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorWorkerHeartbeatsTupleSchemeFactory();
 
   private java.lang.String supervisor_id; // required
   private java.util.List<SupervisorWorkerHeartbeat> worker_heartbeats; // 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 {
     SUPERVISOR_ID((short)1, "supervisor_id"),
     WORKER_HEARTBEATS((short)2, "worker_heartbeats");
 
@@ -99,16 +99,16 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
   }
 
   // isset id assignments
-  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.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.WORKER_HEARTBEATS, new org.apache.thrift.meta_data.FieldMetaData("worker_heartbeats", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, SupervisorWorkerHeartbeat.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.SUPERVISOR_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.WORKER_HEARTBEATS, new org.apache.storm.thrift.meta_data.FieldMetaData("worker_heartbeats", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SupervisorWorkerHeartbeat.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorWorkerHeartbeats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorWorkerHeartbeats.class, metaDataMap);
   }
 
   public SupervisorWorkerHeartbeats() {
@@ -322,7 +322,7 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
       return lastComparison;
     }
     if (is_set_supervisor_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -332,7 +332,7 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
       return lastComparison;
     }
     if (is_set_worker_heartbeats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.worker_heartbeats, other.worker_heartbeats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.worker_heartbeats, other.worker_heartbeats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -344,11 +344,11 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
     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);
   }
 
@@ -376,14 +376,14 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
     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_supervisor_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_worker_heartbeats()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'worker_heartbeats' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'worker_heartbeats' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -391,50 +391,50 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
 
   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 SupervisorWorkerHeartbeatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorWorkerHeartbeatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorWorkerHeartbeatsStandardScheme getScheme() {
       return new SupervisorWorkerHeartbeatsStandardScheme();
     }
   }
 
-  private static class SupervisorWorkerHeartbeatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorWorkerHeartbeats> {
+  private static class SupervisorWorkerHeartbeatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SupervisorWorkerHeartbeats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorWorkerHeartbeats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SupervisorWorkerHeartbeats 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: // SUPERVISOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.supervisor_id = iprot.readString();
               struct.set_supervisor_id_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: // WORKER_HEARTBEATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list878 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list878 = iprot.readListBegin();
                 struct.worker_heartbeats = new java.util.ArrayList<SupervisorWorkerHeartbeat>(_list878.size);
                 SupervisorWorkerHeartbeat _elem879;
                 for (int _i880 = 0; _i880 < _list878.size; ++_i880)
@@ -447,11 +447,11 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
               }
               struct.set_worker_heartbeats_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();
       }
@@ -459,7 +459,7 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorWorkerHeartbeats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SupervisorWorkerHeartbeats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -471,7 +471,7 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
       if (struct.worker_heartbeats != null) {
         oprot.writeFieldBegin(WORKER_HEARTBEATS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.worker_heartbeats.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.worker_heartbeats.size()));
           for (SupervisorWorkerHeartbeat _iter881 : struct.worker_heartbeats)
           {
             _iter881.write(oprot);
@@ -486,17 +486,17 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
 
   }
 
-  private static class SupervisorWorkerHeartbeatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SupervisorWorkerHeartbeatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SupervisorWorkerHeartbeatsTupleScheme getScheme() {
       return new SupervisorWorkerHeartbeatsTupleScheme();
     }
   }
 
-  private static class SupervisorWorkerHeartbeatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorWorkerHeartbeats> {
+  private static class SupervisorWorkerHeartbeatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SupervisorWorkerHeartbeats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkerHeartbeats 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, SupervisorWorkerHeartbeats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.supervisor_id);
       {
         oprot.writeI32(struct.worker_heartbeats.size());
@@ -508,12 +508,12 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkerHeartbeats 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, SupervisorWorkerHeartbeats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.supervisor_id = iprot.readString();
       struct.set_supervisor_id_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list883 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list883 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.worker_heartbeats = new java.util.ArrayList<SupervisorWorkerHeartbeat>(_list883.size);
         SupervisorWorkerHeartbeat _elem884;
         for (int _i885 = 0; _i885 < _list883.size; ++_i885)
@@ -527,8 +527,8 @@ public class SupervisorWorkerHeartbeats implements org.apache.thrift.TBase<Super
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Assignment.java b/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
index 8240934..9b06e81 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Assignment.java
@@ -25,19 +25,19 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class Assignment implements org.apache.thrift.TBase<Assignment, Assignment._Fields>, java.io.Serializable, Cloneable, Comparable<Assignment> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Assignment");
+public class Assignment implements org.apache.storm.thrift.TBase<Assignment, Assignment._Fields>, java.io.Serializable, Cloneable, Comparable<Assignment> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Assignment");
 
-  private static final org.apache.thrift.protocol.TField MASTER_CODE_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("master_code_dir", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NODE_HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("node_host", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField EXECUTOR_NODE_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_node_port", org.apache.thrift.protocol.TType.MAP, (short)3);
-  private static final org.apache.thrift.protocol.TField EXECUTOR_START_TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_start_time_secs", org.apache.thrift.protocol.TType.MAP, (short)4);
-  private static final org.apache.thrift.protocol.TField WORKER_RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("worker_resources", org.apache.thrift.protocol.TType.MAP, (short)5);
-  private static final org.apache.thrift.protocol.TField TOTAL_SHARED_OFF_HEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("total_shared_off_heap", org.apache.thrift.protocol.TType.MAP, (short)6);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField MASTER_CODE_DIR_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("master_code_dir", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NODE_HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("node_host", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTOR_NODE_PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executor_node_port", org.apache.storm.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTOR_START_TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executor_start_time_secs", org.apache.storm.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField WORKER_RESOURCES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("worker_resources", org.apache.storm.thrift.protocol.TType.MAP, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField TOTAL_SHARED_OFF_HEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("total_shared_off_heap", org.apache.storm.thrift.protocol.TType.MAP, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)7);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AssignmentStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AssignmentTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AssignmentStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AssignmentTupleSchemeFactory();
 
   private java.lang.String master_code_dir; // required
   private java.util.Map<java.lang.String,java.lang.String> node_host; // optional
@@ -48,7 +48,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
   private java.lang.String owner; // 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 {
     MASTER_CODE_DIR((short)1, "master_code_dir"),
     NODE_HOST((short)2, "node_host"),
     EXECUTOR_NODE_PORT((short)3, "executor_node_port"),
@@ -125,37 +125,37 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.NODE_HOST,_Fields.EXECUTOR_NODE_PORT,_Fields.EXECUTOR_START_TIME_SECS,_Fields.WORKER_RESOURCES,_Fields.TOTAL_SHARED_OFF_HEAP,_Fields.OWNER};
-  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.MASTER_CODE_DIR, new org.apache.thrift.meta_data.FieldMetaData("master_code_dir", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NODE_HOST, new org.apache.thrift.meta_data.FieldMetaData("node_host", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.EXECUTOR_NODE_PORT, new org.apache.thrift.meta_data.FieldMetaData("executor_node_port", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            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.I64)), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeInfo.class))));
-    tmpMap.put(_Fields.EXECUTOR_START_TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("executor_start_time_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            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.I64)), 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    tmpMap.put(_Fields.WORKER_RESOURCES, new org.apache.thrift.meta_data.FieldMetaData("worker_resources", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NodeInfo.class), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WorkerResources.class))));
-    tmpMap.put(_Fields.TOTAL_SHARED_OFF_HEAP, new org.apache.thrift.meta_data.FieldMetaData("total_shared_off_heap", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
-    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MASTER_CODE_DIR, new org.apache.storm.thrift.meta_data.FieldMetaData("master_code_dir", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NODE_HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("node_host", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.EXECUTOR_NODE_PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("executor_node_port", 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.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NodeInfo.class))));
+    tmpMap.put(_Fields.EXECUTOR_START_TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("executor_start_time_secs", 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.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)), 
+            new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.WORKER_RESOURCES, new org.apache.storm.thrift.meta_data.FieldMetaData("worker_resources", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NodeInfo.class), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, WorkerResources.class))));
+    tmpMap.put(_Fields.TOTAL_SHARED_OFF_HEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("total_shared_off_heap", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
+    tmpMap.put(_Fields.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Assignment.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Assignment.class, metaDataMap);
   }
 
   public Assignment() {
@@ -721,7 +721,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_master_code_dir()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.master_code_dir, other.master_code_dir);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.master_code_dir, other.master_code_dir);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -731,7 +731,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_node_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.node_host, other.node_host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.node_host, other.node_host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -741,7 +741,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_executor_node_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_node_port, other.executor_node_port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executor_node_port, other.executor_node_port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -751,7 +751,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_executor_start_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_start_time_secs, other.executor_start_time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executor_start_time_secs, other.executor_start_time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -761,7 +761,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_worker_resources()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.worker_resources, other.worker_resources);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.worker_resources, other.worker_resources);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -771,7 +771,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_total_shared_off_heap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.total_shared_off_heap, other.total_shared_off_heap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.total_shared_off_heap, other.total_shared_off_heap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -781,7 +781,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -793,11 +793,11 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
     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);
   }
 
@@ -877,10 +877,10 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
     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_master_code_dir()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'master_code_dir' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'master_code_dir' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -888,50 +888,50 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
 
   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 AssignmentStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AssignmentStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AssignmentStandardScheme getScheme() {
       return new AssignmentStandardScheme();
     }
   }
 
-  private static class AssignmentStandardScheme extends org.apache.thrift.scheme.StandardScheme<Assignment> {
+  private static class AssignmentStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<Assignment> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, Assignment 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: // MASTER_CODE_DIR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.master_code_dir = iprot.readString();
               struct.set_master_code_dir_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: // NODE_HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map686 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map686 = iprot.readMapBegin();
                 struct.node_host = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map686.size);
                 java.lang.String _key687;
                 java.lang.String _val688;
@@ -945,20 +945,20 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
               }
               struct.set_node_host_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: // EXECUTOR_NODE_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map690 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map690 = iprot.readMapBegin();
                 struct.executor_node_port = new java.util.HashMap<java.util.List<java.lang.Long>,NodeInfo>(2*_map690.size);
                 java.util.List<java.lang.Long> _key691;
                 NodeInfo _val692;
                 for (int _i693 = 0; _i693 < _map690.size; ++_i693)
                 {
                   {
-                    org.apache.thrift.protocol.TList _list694 = iprot.readListBegin();
+                    org.apache.storm.thrift.protocol.TList _list694 = iprot.readListBegin();
                     _key691 = new java.util.ArrayList<java.lang.Long>(_list694.size);
                     long _elem695;
                     for (int _i696 = 0; _i696 < _list694.size; ++_i696)
@@ -976,20 +976,20 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
               }
               struct.set_executor_node_port_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: // EXECUTOR_START_TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map697 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map697 = iprot.readMapBegin();
                 struct.executor_start_time_secs = new java.util.HashMap<java.util.List<java.lang.Long>,java.lang.Long>(2*_map697.size);
                 java.util.List<java.lang.Long> _key698;
                 long _val699;
                 for (int _i700 = 0; _i700 < _map697.size; ++_i700)
                 {
                   {
-                    org.apache.thrift.protocol.TList _list701 = iprot.readListBegin();
+                    org.apache.storm.thrift.protocol.TList _list701 = iprot.readListBegin();
                     _key698 = new java.util.ArrayList<java.lang.Long>(_list701.size);
                     long _elem702;
                     for (int _i703 = 0; _i703 < _list701.size; ++_i703)
@@ -1006,13 +1006,13 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
               }
               struct.set_executor_start_time_secs_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: // WORKER_RESOURCES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map704 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map704 = iprot.readMapBegin();
                 struct.worker_resources = new java.util.HashMap<NodeInfo,WorkerResources>(2*_map704.size);
                 NodeInfo _key705;
                 WorkerResources _val706;
@@ -1028,13 +1028,13 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
               }
               struct.set_worker_resources_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: // TOTAL_SHARED_OFF_HEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map708 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map708 = iprot.readMapBegin();
                 struct.total_shared_off_heap = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map708.size);
                 java.lang.String _key709;
                 double _val710;
@@ -1048,19 +1048,19 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
               }
               struct.set_total_shared_off_heap_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: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_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();
       }
@@ -1068,7 +1068,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, Assignment struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1081,7 +1081,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
         if (struct.is_set_node_host()) {
           oprot.writeFieldBegin(NODE_HOST_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.node_host.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, struct.node_host.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter712 : struct.node_host.entrySet())
             {
               oprot.writeString(_iter712.getKey());
@@ -1096,11 +1096,11 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
         if (struct.is_set_executor_node_port()) {
           oprot.writeFieldBegin(EXECUTOR_NODE_PORT_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, struct.executor_node_port.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.STRUCT, struct.executor_node_port.size()));
             for (java.util.Map.Entry<java.util.List<java.lang.Long>, NodeInfo> _iter713 : struct.executor_node_port.entrySet())
             {
               {
-                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter713.getKey().size()));
+                oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, _iter713.getKey().size()));
                 for (long _iter714 : _iter713.getKey())
                 {
                   oprot.writeI64(_iter714);
@@ -1118,11 +1118,11 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
         if (struct.is_set_executor_start_time_secs()) {
           oprot.writeFieldBegin(EXECUTOR_START_TIME_SECS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, struct.executor_start_time_secs.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.I64, struct.executor_start_time_secs.size()));
             for (java.util.Map.Entry<java.util.List<java.lang.Long>, java.lang.Long> _iter715 : struct.executor_start_time_secs.entrySet())
             {
               {
-                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter715.getKey().size()));
+                oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, _iter715.getKey().size()));
                 for (long _iter716 : _iter715.getKey())
                 {
                   oprot.writeI64(_iter716);
@@ -1140,7 +1140,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
         if (struct.is_set_worker_resources()) {
           oprot.writeFieldBegin(WORKER_RESOURCES_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.worker_resources.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, struct.worker_resources.size()));
             for (java.util.Map.Entry<NodeInfo, WorkerResources> _iter717 : struct.worker_resources.entrySet())
             {
               _iter717.getKey().write(oprot);
@@ -1155,7 +1155,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
         if (struct.is_set_total_shared_off_heap()) {
           oprot.writeFieldBegin(TOTAL_SHARED_OFF_HEAP_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.total_shared_off_heap.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.total_shared_off_heap.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter718 : struct.total_shared_off_heap.entrySet())
             {
               oprot.writeString(_iter718.getKey());
@@ -1179,17 +1179,17 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
 
   }
 
-  private static class AssignmentTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AssignmentTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AssignmentTupleScheme getScheme() {
       return new AssignmentTupleScheme();
     }
   }
 
-  private static class AssignmentTupleScheme extends org.apache.thrift.scheme.TupleScheme<Assignment> {
+  private static class AssignmentTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<Assignment> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Assignment 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, Assignment struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.master_code_dir);
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_node_host()) {
@@ -1279,14 +1279,14 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Assignment 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, Assignment struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.master_code_dir = iprot.readString();
       struct.set_master_code_dir_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map726 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map726 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.node_host = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map726.size);
           java.lang.String _key727;
           java.lang.String _val728;
@@ -1301,14 +1301,14 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map730 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map730 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.executor_node_port = new java.util.HashMap<java.util.List<java.lang.Long>,NodeInfo>(2*_map730.size);
           java.util.List<java.lang.Long> _key731;
           NodeInfo _val732;
           for (int _i733 = 0; _i733 < _map730.size; ++_i733)
           {
             {
-              org.apache.thrift.protocol.TList _list734 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+              org.apache.storm.thrift.protocol.TList _list734 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
               _key731 = new java.util.ArrayList<java.lang.Long>(_list734.size);
               long _elem735;
               for (int _i736 = 0; _i736 < _list734.size; ++_i736)
@@ -1326,14 +1326,14 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map737 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map737 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.LIST, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.executor_start_time_secs = new java.util.HashMap<java.util.List<java.lang.Long>,java.lang.Long>(2*_map737.size);
           java.util.List<java.lang.Long> _key738;
           long _val739;
           for (int _i740 = 0; _i740 < _map737.size; ++_i740)
           {
             {
-              org.apache.thrift.protocol.TList _list741 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+              org.apache.storm.thrift.protocol.TList _list741 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
               _key738 = new java.util.ArrayList<java.lang.Long>(_list741.size);
               long _elem742;
               for (int _i743 = 0; _i743 < _list741.size; ++_i743)
@@ -1350,7 +1350,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TMap _map744 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map744 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.worker_resources = new java.util.HashMap<NodeInfo,WorkerResources>(2*_map744.size);
           NodeInfo _key745;
           WorkerResources _val746;
@@ -1367,7 +1367,7 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TMap _map748 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map748 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.total_shared_off_heap = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map748.size);
           java.lang.String _key749;
           double _val750;
@@ -1387,8 +1387,8 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen
     }
   }
 
-  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/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java b/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java
index b025e86..217bf37 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/AuthorizationException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class AuthorizationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
+public class AuthorizationException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AuthorizationException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AuthorizationExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AuthorizationExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AuthorizationExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AuthorizationExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthorizationException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthorizationException.class, metaDataMap);
   }
 
   public AuthorizationException() {
@@ -240,7 +240,7 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
     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);
   }
 
@@ -276,10 +276,10 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
 
   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 AuthorizationExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AuthorizationExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AuthorizationExceptionStandardScheme getScheme() {
       return new AuthorizationExceptionStandardScheme();
     }
   }
 
-  private static class AuthorizationExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<AuthorizationException> {
+  private static class AuthorizationExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<AuthorizationException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, AuthorizationException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AuthorizationException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, AuthorizationException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AuthorizationException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class AuthorizationException extends org.apache.thrift.TException impleme
 
   }
 
-  private static class AuthorizationExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class AuthorizationExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public AuthorizationExceptionTupleScheme getScheme() {
       return new AuthorizationExceptionTupleScheme();
     }
   }
 
-  private static class AuthorizationExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<AuthorizationException> {
+  private static class AuthorizationExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<AuthorizationException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, AuthorizationException 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, AuthorizationException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, AuthorizationException 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, AuthorizationException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/BeginDownloadResult.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java b/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java
index 17436aa..71d04d0 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/BeginDownloadResult.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 BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloadResult, BeginDownloadResult._Fields>, java.io.Serializable, Cloneable, Comparable<BeginDownloadResult> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BeginDownloadResult");
+public class BeginDownloadResult implements org.apache.storm.thrift.TBase<BeginDownloadResult, BeginDownloadResult._Fields>, java.io.Serializable, Cloneable, Comparable<BeginDownloadResult> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("BeginDownloadResult");
 
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.I64, (short)1);
-  private static final org.apache.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("session", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField DATA_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("data_size", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("version", org.apache.storm.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("session", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField DATA_SIZE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("data_size", org.apache.storm.thrift.protocol.TType.I64, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BeginDownloadResultStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BeginDownloadResultTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BeginDownloadResultStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BeginDownloadResultTupleSchemeFactory();
 
   private long version; // required
   private java.lang.String session; // required
   private long data_size; // 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 {
     VERSION((short)1, "version"),
     SESSION((short)2, "session"),
     DATA_SIZE((short)3, "data_size");
@@ -108,17 +108,17 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
   private static final int __DATA_SIZE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.DATA_SIZE};
-  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.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.SESSION, new org.apache.thrift.meta_data.FieldMetaData("session", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.DATA_SIZE, new org.apache.thrift.meta_data.FieldMetaData("data_size", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    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.VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("version", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.SESSION, new org.apache.storm.thrift.meta_data.FieldMetaData("session", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.DATA_SIZE, new org.apache.storm.thrift.meta_data.FieldMetaData("data_size", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BeginDownloadResult.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BeginDownloadResult.class, metaDataMap);
   }
 
   public BeginDownloadResult() {
@@ -169,16 +169,16 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
   }
 
   public void unset_version() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   /** Returns true if field version is set (has been assigned a value) and false otherwise */
   public boolean is_set_version() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID);
   }
 
   public void set_version_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value);
   }
 
   public java.lang.String get_session() {
@@ -214,16 +214,16 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
   }
 
   public void unset_data_size() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DATA_SIZE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __DATA_SIZE_ISSET_ID);
   }
 
   /** Returns true if field data_size is set (has been assigned a value) and false otherwise */
   public boolean is_set_data_size() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DATA_SIZE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __DATA_SIZE_ISSET_ID);
   }
 
   public void set_data_size_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DATA_SIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __DATA_SIZE_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -336,7 +336,7 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
   public int hashCode() {
     int hashCode = 1;
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(version);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(version);
 
     hashCode = hashCode * 8191 + ((is_set_session()) ? 131071 : 524287);
     if (is_set_session())
@@ -344,7 +344,7 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
 
     hashCode = hashCode * 8191 + ((is_set_data_size()) ? 131071 : 524287);
     if (is_set_data_size())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(data_size);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(data_size);
 
     return hashCode;
   }
@@ -362,7 +362,7 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
       return lastComparison;
     }
     if (is_set_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.version, other.version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -372,7 +372,7 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
       return lastComparison;
     }
     if (is_set_session()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, other.session);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.session, other.session);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -382,7 +382,7 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
       return lastComparison;
     }
     if (is_set_data_size()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data_size, other.data_size);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.data_size, other.data_size);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -394,11 +394,11 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
     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);
   }
 
@@ -428,14 +428,14 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
     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_version()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
     }
 
     if (!is_set_session()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'session' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'session' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -443,8 +443,8 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
 
   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);
     }
   }
@@ -453,56 +453,56 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
     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 BeginDownloadResultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BeginDownloadResultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BeginDownloadResultStandardScheme getScheme() {
       return new BeginDownloadResultStandardScheme();
     }
   }
 
-  private static class BeginDownloadResultStandardScheme extends org.apache.thrift.scheme.StandardScheme<BeginDownloadResult> {
+  private static class BeginDownloadResultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<BeginDownloadResult> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, BeginDownloadResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, BeginDownloadResult 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: // VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.version = iprot.readI64();
               struct.set_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 2: // SESSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.session = iprot.readString();
               struct.set_session_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: // DATA_SIZE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.data_size = iprot.readI64();
               struct.set_data_size_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();
       }
@@ -510,7 +510,7 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, BeginDownloadResult struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, BeginDownloadResult struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -533,17 +533,17 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
 
   }
 
-  private static class BeginDownloadResultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BeginDownloadResultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BeginDownloadResultTupleScheme getScheme() {
       return new BeginDownloadResultTupleScheme();
     }
   }
 
-  private static class BeginDownloadResultTupleScheme extends org.apache.thrift.scheme.TupleScheme<BeginDownloadResult> {
+  private static class BeginDownloadResultTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<BeginDownloadResult> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, BeginDownloadResult 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, BeginDownloadResult struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI64(struct.version);
       oprot.writeString(struct.session);
       java.util.BitSet optionals = new java.util.BitSet();
@@ -557,8 +557,8 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, BeginDownloadResult 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, BeginDownloadResult struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.version = iprot.readI64();
       struct.set_version_isSet(true);
       struct.session = iprot.readString();
@@ -571,8 +571,8 @@ public class BeginDownloadResult implements org.apache.thrift.TBase<BeginDownloa
     }
   }
 
-  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/Bolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Bolt.java b/storm-client/src/jvm/org/apache/storm/generated/Bolt.java
index 1a3b712..3d25697 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Bolt.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Bolt.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 Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable, Comparable<Bolt> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bolt");
+public class Bolt implements org.apache.storm.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable, Comparable<Bolt> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("Bolt");
 
-  private static final org.apache.thrift.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bolt_object", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("common", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BoltStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BoltTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BoltStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BoltTupleSchemeFactory();
 
   private ComponentObject bolt_object; // required
   private ComponentCommon common; // 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 {
     BOLT_OBJECT((short)1, "bolt_object"),
     COMMON((short)2, "common");
 
@@ -99,15 +99,15 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
   }
 
   // isset id assignments
-  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.BOLT_OBJECT, new org.apache.thrift.meta_data.FieldMetaData("bolt_object", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentObject.class)));
-    tmpMap.put(_Fields.COMMON, new org.apache.thrift.meta_data.FieldMetaData("common", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentCommon.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.BOLT_OBJECT, new org.apache.storm.thrift.meta_data.FieldMetaData("bolt_object", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentObject.class)));
+    tmpMap.put(_Fields.COMMON, new org.apache.storm.thrift.meta_data.FieldMetaData("common", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentCommon.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Bolt.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Bolt.class, metaDataMap);
   }
 
   public Bolt() {
@@ -302,7 +302,7 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
       return lastComparison;
     }
     if (is_set_bolt_object()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolt_object, other.bolt_object);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.bolt_object, other.bolt_object);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
       return lastComparison;
     }
     if (is_set_common()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.common, other.common);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
     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);
   }
 
@@ -356,14 +356,14 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
     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_bolt_object()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'bolt_object' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'bolt_object' is unset! Struct:" + toString());
     }
 
     if (!is_set_common()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -374,58 +374,58 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
 
   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 BoltStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BoltStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BoltStandardScheme getScheme() {
       return new BoltStandardScheme();
     }
   }
 
-  private static class BoltStandardScheme extends org.apache.thrift.scheme.StandardScheme<Bolt> {
+  private static class BoltStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<Bolt> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Bolt struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, Bolt 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: // BOLT_OBJECT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.bolt_object = new ComponentObject();
               struct.bolt_object.read(iprot);
               struct.set_bolt_object_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: // COMMON
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.common = new ComponentCommon();
               struct.common.read(iprot);
               struct.set_common_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();
       }
@@ -433,7 +433,7 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, Bolt struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, Bolt struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -453,24 +453,24 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
 
   }
 
-  private static class BoltTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BoltTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BoltTupleScheme getScheme() {
       return new BoltTupleScheme();
     }
   }
 
-  private static class BoltTupleScheme extends org.apache.thrift.scheme.TupleScheme<Bolt> {
+  private static class BoltTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<Bolt> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Bolt 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, Bolt struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.bolt_object.write(oprot);
       struct.common.write(oprot);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Bolt 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, Bolt struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.bolt_object = new ComponentObject();
       struct.bolt_object.read(iprot);
       struct.set_bolt_object_isSet(true);
@@ -480,8 +480,8 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java b/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
index 7f1c005..7323c16 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields>, java.io.Serializable, Cloneable, Comparable<HBNodes> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBNodes");
+public class HBNodes implements org.apache.storm.thrift.TBase<HBNodes, HBNodes._Fields>, java.io.Serializable, Cloneable, Comparable<HBNodes> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBNodes");
 
-  private static final org.apache.thrift.protocol.TField PULSE_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("pulseIds", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PULSE_IDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("pulseIds", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBNodesStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBNodesTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBNodesStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBNodesTupleSchemeFactory();
 
   private java.util.List<java.lang.String> pulseIds; // 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 {
     PULSE_IDS((short)1, "pulseIds");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,14 +94,14 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
   }
 
   // isset id assignments
-  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.PULSE_IDS, new org.apache.thrift.meta_data.FieldMetaData("pulseIds", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        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))));
+    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.PULSE_IDS, new org.apache.storm.thrift.meta_data.FieldMetaData("pulseIds", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        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))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBNodes.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBNodes.class, metaDataMap);
   }
 
   public HBNodes() {
@@ -257,7 +257,7 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
       return lastComparison;
     }
     if (is_set_pulseIds()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pulseIds, other.pulseIds);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.pulseIds, other.pulseIds);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -269,11 +269,11 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
     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);
   }
 
@@ -293,49 +293,49 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 HBNodesStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBNodesStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBNodesStandardScheme getScheme() {
       return new HBNodesStandardScheme();
     }
   }
 
-  private static class HBNodesStandardScheme extends org.apache.thrift.scheme.StandardScheme<HBNodes> {
+  private static class HBNodesStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBNodes> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HBNodes struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBNodes 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: // PULSE_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list912 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list912 = iprot.readListBegin();
                 struct.pulseIds = new java.util.ArrayList<java.lang.String>(_list912.size);
                 java.lang.String _elem913;
                 for (int _i914 = 0; _i914 < _list912.size; ++_i914)
@@ -347,11 +347,11 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
               }
               struct.set_pulseIds_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();
       }
@@ -359,14 +359,14 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HBNodes struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBNodes struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.pulseIds != null) {
         oprot.writeFieldBegin(PULSE_IDS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.pulseIds.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.pulseIds.size()));
           for (java.lang.String _iter915 : struct.pulseIds)
           {
             oprot.writeString(_iter915);
@@ -381,17 +381,17 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
 
   }
 
-  private static class HBNodesTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBNodesTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBNodesTupleScheme getScheme() {
       return new HBNodesTupleScheme();
     }
   }
 
-  private static class HBNodesTupleScheme extends org.apache.thrift.scheme.TupleScheme<HBNodes> {
+  private static class HBNodesTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<HBNodes> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HBNodes 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, HBNodes struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_pulseIds()) {
         optionals.set(0);
@@ -409,12 +409,12 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HBNodes 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, HBNodes struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list917 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list917 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.pulseIds = new java.util.ArrayList<java.lang.String>(_list917.size);
           java.lang.String _elem918;
           for (int _i919 = 0; _i919 < _list917.size; ++_i919)
@@ -428,8 +428,8 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields
     }
   }
 
-  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/HBPulse.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java b/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java
index 82e2bbb..0ed4789 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBPulse.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBPulse.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 HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields>, java.io.Serializable, Cloneable, Comparable<HBPulse> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBPulse");
+public class HBPulse implements org.apache.storm.thrift.TBase<HBPulse, HBPulse._Fields>, java.io.Serializable, Cloneable, Comparable<HBPulse> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBPulse");
 
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField DETAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("details", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField DETAILS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("details", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBPulseStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBPulseTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBPulseStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBPulseTupleSchemeFactory();
 
   private java.lang.String id; // required
   private java.nio.ByteBuffer details; // 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 {
     ID((short)1, "id"),
     DETAILS((short)2, "details");
 
@@ -99,15 +99,15 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
   }
 
   // isset id assignments
-  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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.DETAILS, new org.apache.thrift.meta_data.FieldMetaData("details", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    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.ID, new org.apache.storm.thrift.meta_data.FieldMetaData("id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.DETAILS, new org.apache.storm.thrift.meta_data.FieldMetaData("details", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBPulse.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBPulse.class, metaDataMap);
   }
 
   public HBPulse() {
@@ -119,7 +119,7 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
   {
     this();
     this.id = id;
-    this.details = org.apache.thrift.TBaseHelper.copyBinary(details);
+    this.details = org.apache.storm.thrift.TBaseHelper.copyBinary(details);
   }
 
   /**
@@ -130,7 +130,7 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
       this.id = other.id;
     }
     if (other.is_set_details()) {
-      this.details = org.apache.thrift.TBaseHelper.copyBinary(other.details);
+      this.details = org.apache.storm.thrift.TBaseHelper.copyBinary(other.details);
     }
   }
 
@@ -168,12 +168,12 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
   }
 
   public byte[] get_details() {
-    set_details(org.apache.thrift.TBaseHelper.rightSize(details));
+    set_details(org.apache.storm.thrift.TBaseHelper.rightSize(details));
     return details == null ? null : details.array();
   }
 
   public java.nio.ByteBuffer buffer_for_details() {
-    return org.apache.thrift.TBaseHelper.copyBinary(details);
+    return org.apache.storm.thrift.TBaseHelper.copyBinary(details);
   }
 
   public void set_details(byte[] details) {
@@ -181,7 +181,7 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
   }
 
   public void set_details(java.nio.ByteBuffer details) {
-    this.details = org.apache.thrift.TBaseHelper.copyBinary(details);
+    this.details = org.apache.storm.thrift.TBaseHelper.copyBinary(details);
   }
 
   public void unset_details() {
@@ -315,7 +315,7 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
       return lastComparison;
     }
     if (is_set_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id, other.id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -325,7 +325,7 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
       return lastComparison;
     }
     if (is_set_details()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.details, other.details);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.details, other.details);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -337,11 +337,11 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
     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);
   }
 
@@ -362,17 +362,17 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
     if (this.details == null) {
       sb.append("null");
     } else {
-      org.apache.thrift.TBaseHelper.toString(this.details, sb);
+      org.apache.storm.thrift.TBaseHelper.toString(this.details, sb);
     }
     first = false;
     sb.append(")");
     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_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -380,56 +380,56 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
 
   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 HBPulseStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBPulseStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBPulseStandardScheme getScheme() {
       return new HBPulseStandardScheme();
     }
   }
 
-  private static class HBPulseStandardScheme extends org.apache.thrift.scheme.StandardScheme<HBPulse> {
+  private static class HBPulseStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBPulse> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HBPulse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBPulse 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: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.id = iprot.readString();
               struct.set_id_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: // DETAILS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.details = iprot.readBinary();
               struct.set_details_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();
       }
@@ -437,7 +437,7 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HBPulse struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBPulse struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -457,17 +457,17 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
 
   }
 
-  private static class HBPulseTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBPulseTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBPulseTupleScheme getScheme() {
       return new HBPulseTupleScheme();
     }
   }
 
-  private static class HBPulseTupleScheme extends org.apache.thrift.scheme.TupleScheme<HBPulse> {
+  private static class HBPulseTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<HBPulse> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HBPulse 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, HBPulse struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.id);
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_details()) {
@@ -480,8 +480,8 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HBPulse 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, HBPulse struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.id = iprot.readString();
       struct.set_id_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(1);
@@ -492,8 +492,8 @@ public class HBPulse implements org.apache.thrift.TBase<HBPulse, HBPulse._Fields
     }
   }
 
-  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/HBRecords.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java b/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java
index 08043fa..940fd86 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._Fields>, java.io.Serializable, Cloneable, Comparable<HBRecords> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HBRecords");
+public class HBRecords implements org.apache.storm.thrift.TBase<HBRecords, HBRecords._Fields>, java.io.Serializable, Cloneable, Comparable<HBRecords> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("HBRecords");
 
-  private static final org.apache.thrift.protocol.TField PULSES_FIELD_DESC = new org.apache.thrift.protocol.TField("pulses", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PULSES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("pulses", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBRecordsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBRecordsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HBRecordsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HBRecordsTupleSchemeFactory();
 
   private java.util.List<HBPulse> pulses; // 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 {
     PULSES((short)1, "pulses");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,14 +94,14 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
   }
 
   // isset id assignments
-  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.PULSES, new org.apache.thrift.meta_data.FieldMetaData("pulses", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        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, HBPulse.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.PULSES, new org.apache.storm.thrift.meta_data.FieldMetaData("pulses", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, HBPulse.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBRecords.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HBRecords.class, metaDataMap);
   }
 
   public HBRecords() {
@@ -260,7 +260,7 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
       return lastComparison;
     }
     if (is_set_pulses()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.pulses, other.pulses);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.pulses, other.pulses);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -272,11 +272,11 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
     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);
   }
 
@@ -296,49 +296,49 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 HBRecordsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBRecordsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBRecordsStandardScheme getScheme() {
       return new HBRecordsStandardScheme();
     }
   }
 
-  private static class HBRecordsStandardScheme extends org.apache.thrift.scheme.StandardScheme<HBRecords> {
+  private static class HBRecordsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<HBRecords> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HBRecords struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, HBRecords 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: // PULSES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list904 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list904 = iprot.readListBegin();
                 struct.pulses = new java.util.ArrayList<HBPulse>(_list904.size);
                 HBPulse _elem905;
                 for (int _i906 = 0; _i906 < _list904.size; ++_i906)
@@ -351,11 +351,11 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
               }
               struct.set_pulses_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();
       }
@@ -363,14 +363,14 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HBRecords struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, HBRecords struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.pulses != null) {
         oprot.writeFieldBegin(PULSES_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.pulses.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.pulses.size()));
           for (HBPulse _iter907 : struct.pulses)
           {
             _iter907.write(oprot);
@@ -385,17 +385,17 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
 
   }
 
-  private static class HBRecordsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class HBRecordsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public HBRecordsTupleScheme getScheme() {
       return new HBRecordsTupleScheme();
     }
   }
 
-  private static class HBRecordsTupleScheme extends org.apache.thrift.scheme.TupleScheme<HBRecords> {
+  private static class HBRecordsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<HBRecords> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HBRecords 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, HBRecords struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_pulses()) {
         optionals.set(0);
@@ -413,12 +413,12 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HBRecords 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, HBRecords struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list909 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list909 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.pulses = new java.util.ArrayList<HBPulse>(_list909.size);
           HBPulse _elem910;
           for (int _i911 = 0; _i911 < _list909.size; ++_i911)
@@ -433,8 +433,8 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._
     }
   }
 
-  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/HBServerMessageType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java b/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java
index 8656a23..930609a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/HBServerMessageType.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum HBServerMessageType implements org.apache.thrift.TEnum {
+public enum HBServerMessageType implements org.apache.storm.thrift.TEnum {
   CREATE_PATH(0),
   CREATE_PATH_RESPONSE(1),
   EXISTS(2),

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java b/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
index d4b9442..04c86ed 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/InvalidTopologyException.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class InvalidTopologyException extends org.apache.thrift.TException implements org.apache.thrift.TBase<InvalidTopologyException, InvalidTopologyException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTopologyException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTopologyException");
+public class InvalidTopologyException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<InvalidTopologyException, InvalidTopologyException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTopologyException> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("InvalidTopologyException");
 
-  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new InvalidTopologyExceptionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InvalidTopologyExceptionTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new InvalidTopologyExceptionStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InvalidTopologyExceptionTupleSchemeFactory();
 
   private java.lang.String msg; // 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 {
     MSG((short)1, "msg");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,13 +94,13 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
   }
 
   // isset id assignments
-  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.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidTopologyException.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidTopologyException.class, metaDataMap);
   }
 
   public InvalidTopologyException() {
@@ -240,7 +240,7 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
       return lastComparison;
     }
     if (is_set_msg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -252,11 +252,11 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
     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);
   }
 
@@ -276,10 +276,10 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
     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_msg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -287,48 +287,48 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
 
   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 InvalidTopologyExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class InvalidTopologyExceptionStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public InvalidTopologyExceptionStandardScheme getScheme() {
       return new InvalidTopologyExceptionStandardScheme();
     }
   }
 
-  private static class InvalidTopologyExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<InvalidTopologyException> {
+  private static class InvalidTopologyExceptionStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<InvalidTopologyException> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidTopologyException struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, InvalidTopologyException 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: // MSG
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.msg = iprot.readString();
               struct.set_msg_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();
       }
@@ -336,7 +336,7 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, InvalidTopologyException struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -351,30 +351,30 @@ public class InvalidTopologyException extends org.apache.thrift.TException imple
 
   }
 
-  private static class InvalidTopologyExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class InvalidTopologyExceptionTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public InvalidTopologyExceptionTupleScheme getScheme() {
       return new InvalidTopologyExceptionTupleScheme();
     }
   }
 
-  private static class InvalidTopologyExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<InvalidTopologyException> {
+  private static class InvalidTopologyExceptionTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<InvalidTopologyException> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException 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, InvalidTopologyException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.msg);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException 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, InvalidTopologyException struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.msg = iprot.readString();
       struct.set_msg_isSet(true);
     }
   }
 
-  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/JavaObject.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java b/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java
index 911a590..b671a47 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/JavaObject.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/JavaObject.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 JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable, Comparable<JavaObject> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObject");
+public class JavaObject implements org.apache.storm.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable, Comparable<JavaObject> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("JavaObject");
 
-  private static final org.apache.thrift.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("full_class_name", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField ARGS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("args_list", org.apache.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("full_class_name", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField ARGS_LIST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("args_list", org.apache.storm.thrift.protocol.TType.LIST, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new JavaObjectStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new JavaObjectTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new JavaObjectStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new JavaObjectTupleSchemeFactory();
 
   private java.lang.String full_class_name; // required
   private java.util.List<JavaObjectArg> args_list; // 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 {
     FULL_CLASS_NAME((short)1, "full_class_name"),
     ARGS_LIST((short)2, "args_list");
 
@@ -99,16 +99,16 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
   }
 
   // isset id assignments
-  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.FULL_CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("full_class_name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ARGS_LIST, new org.apache.thrift.meta_data.FieldMetaData("args_list", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, JavaObjectArg.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.FULL_CLASS_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("full_class_name", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ARGS_LIST, new org.apache.storm.thrift.meta_data.FieldMetaData("args_list", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, JavaObjectArg.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObject.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObject.class, metaDataMap);
   }
 
   public JavaObject() {
@@ -322,7 +322,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
       return lastComparison;
     }
     if (is_set_full_class_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.full_class_name, other.full_class_name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.full_class_name, other.full_class_name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -332,7 +332,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
       return lastComparison;
     }
     if (is_set_args_list()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.args_list, other.args_list);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.args_list, other.args_list);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -344,11 +344,11 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
     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);
   }
 
@@ -376,14 +376,14 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
     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_full_class_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'full_class_name' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'full_class_name' is unset! Struct:" + toString());
     }
 
     if (!is_set_args_list()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'args_list' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'args_list' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -391,50 +391,50 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
 
   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 JavaObjectStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class JavaObjectStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public JavaObjectStandardScheme getScheme() {
       return new JavaObjectStandardScheme();
     }
   }
 
-  private static class JavaObjectStandardScheme extends org.apache.thrift.scheme.StandardScheme<JavaObject> {
+  private static class JavaObjectStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<JavaObject> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, JavaObject struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, JavaObject 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: // FULL_CLASS_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.full_class_name = iprot.readString();
               struct.set_full_class_name_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: // ARGS_LIST
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list0 = iprot.readListBegin();
                 struct.args_list = new java.util.ArrayList<JavaObjectArg>(_list0.size);
                 JavaObjectArg _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
@@ -447,11 +447,11 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
               }
               struct.set_args_list_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();
       }
@@ -459,7 +459,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, JavaObject struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, JavaObject struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -471,7 +471,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
       if (struct.args_list != null) {
         oprot.writeFieldBegin(ARGS_LIST_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.args_list.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.args_list.size()));
           for (JavaObjectArg _iter3 : struct.args_list)
           {
             _iter3.write(oprot);
@@ -486,17 +486,17 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
 
   }
 
-  private static class JavaObjectTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class JavaObjectTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public JavaObjectTupleScheme getScheme() {
       return new JavaObjectTupleScheme();
     }
   }
 
-  private static class JavaObjectTupleScheme extends org.apache.thrift.scheme.TupleScheme<JavaObject> {
+  private static class JavaObjectTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<JavaObject> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, JavaObject 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, JavaObject struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.full_class_name);
       {
         oprot.writeI32(struct.args_list.size());
@@ -508,12 +508,12 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, JavaObject 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, JavaObject struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.full_class_name = iprot.readString();
       struct.set_full_class_name_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list5 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.args_list = new java.util.ArrayList<JavaObjectArg>(_list5.size);
         JavaObjectArg _elem6;
         for (int _i7 = 0; _i7 < _list5.size; ++_i7)
@@ -527,8 +527,8 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
     }
   }
 
-  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/JavaObjectArg.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java b/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java
index 17c38f6..177e11d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/JavaObjectArg.java
@@ -24,17 +24,17 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaObjectArg._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObjectArg");
-  private static final org.apache.thrift.protocol.TField INT_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("int_arg", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField LONG_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("long_arg", org.apache.thrift.protocol.TType.I64, (short)2);
-  private static final org.apache.thrift.protocol.TField STRING_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("string_arg", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField BOOL_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("bool_arg", org.apache.thrift.protocol.TType.BOOL, (short)4);
-  private static final org.apache.thrift.protocol.TField BINARY_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("binary_arg", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField DOUBLE_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("double_arg", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
+public class JavaObjectArg extends org.apache.storm.thrift.TUnion<JavaObjectArg, JavaObjectArg._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("JavaObjectArg");
+  private static final org.apache.storm.thrift.protocol.TField INT_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("int_arg", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField LONG_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("long_arg", org.apache.storm.thrift.protocol.TType.I64, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField STRING_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("string_arg", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField BOOL_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bool_arg", org.apache.storm.thrift.protocol.TType.BOOL, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField BINARY_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("binary_arg", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField DOUBLE_ARG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("double_arg", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)6);
 
   /** 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 {
     INT_ARG((short)1, "int_arg"),
     LONG_ARG((short)2, "long_arg"),
     STRING_ARG((short)3, "string_arg"),
@@ -106,23 +106,23 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
     }
   }
 
-  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.INT_ARG, new org.apache.thrift.meta_data.FieldMetaData("int_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.LONG_ARG, new org.apache.thrift.meta_data.FieldMetaData("long_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.STRING_ARG, new org.apache.thrift.meta_data.FieldMetaData("string_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BOOL_ARG, new org.apache.thrift.meta_data.FieldMetaData("bool_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.BINARY_ARG, new org.apache.thrift.meta_data.FieldMetaData("binary_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.DOUBLE_ARG, new org.apache.thrift.meta_data.FieldMetaData("double_arg", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.INT_ARG, new org.apache.storm.thrift.meta_data.FieldMetaData("int_arg", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.LONG_ARG, new org.apache.storm.thrift.meta_data.FieldMetaData("long_arg", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.STRING_ARG, new org.apache.storm.thrift.meta_data.FieldMetaData("string_arg", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.BOOL_ARG, new org.apache.storm.thrift.meta_data.FieldMetaData("bool_arg", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.BINARY_ARG, new org.apache.storm.thrift.meta_data.FieldMetaData("binary_arg", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.DOUBLE_ARG, new org.apache.storm.thrift.meta_data.FieldMetaData("double_arg", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObjectArg.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JavaObjectArg.class, metaDataMap);
   }
 
   public JavaObjectArg() {
@@ -222,7 +222,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -232,7 +232,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
             int_arg = iprot.readI32();
             return int_arg;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case LONG_ARG:
@@ -241,7 +241,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
             long_arg = iprot.readI64();
             return long_arg;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case STRING_ARG:
@@ -250,7 +250,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
             string_arg = iprot.readString();
             return string_arg;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case BOOL_ARG:
@@ -259,7 +259,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
             bool_arg = iprot.readBool();
             return bool_arg;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case BINARY_ARG:
@@ -268,7 +268,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
             binary_arg = iprot.readBinary();
             return binary_arg;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case DOUBLE_ARG:
@@ -277,20 +277,20 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
             double_arg = iprot.readDouble();
             return double_arg;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case INT_ARG:
         java.lang.Integer int_arg = (java.lang.Integer)value_;
@@ -322,7 +322,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
@@ -354,12 +354,12 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case INT_ARG:
         java.lang.Integer int_arg = (java.lang.Integer)value_;
@@ -391,7 +391,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case INT_ARG:
         return INT_ARG_FIELD_DESC;
@@ -411,7 +411,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -479,14 +479,14 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   }
 
   public byte[] get_binary_arg() {
-    set_binary_arg(org.apache.thrift.TBaseHelper.rightSize(buffer_for_binary_arg()));
+    set_binary_arg(org.apache.storm.thrift.TBaseHelper.rightSize(buffer_for_binary_arg()));
     java.nio.ByteBuffer b = buffer_for_binary_arg();
     return b == null ? null : b.array();
   }
 
   public java.nio.ByteBuffer buffer_for_binary_arg() {
     if (getSetField() == _Fields.BINARY_ARG) {
-      return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());
     } else {
       throw new java.lang.RuntimeException("Cannot get field 'binary_arg' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
@@ -559,9 +559,9 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
 
   @Override
   public int compareTo(JavaObjectArg other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -571,12 +571,12 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -585,8 +585,8 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
   }
   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);
     }
   }
@@ -594,8 +594,8 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
 
   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);
     }
   }


[05/50] [abbrv] storm git commit: STORM-2882: commons-{lang, collections, io}

Posted by bo...@apache.org.
STORM-2882: commons-{lang,collections,io}


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/62f9568e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/62f9568e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/62f9568e

Branch: refs/heads/master
Commit: 62f9568e150fff3f306ab3b204ef7660afdd34d3
Parents: 719221c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue May 29 11:34:49 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:12 2018 -0500

----------------------------------------------------------------------
 examples/storm-loadgen/pom.xml                  |  4 +++
 external/storm-kafka-client/pom.xml             |  4 +++
 external/storm-kafka-migration/pom.xml          |  4 +++
 shaded-deps/pom.xml                             | 35 ++++++++++++++++++--
 storm-client/pom.xml                            | 16 ---------
 .../jvm/org/apache/storm/StormSubmitter.java    |  2 +-
 .../org/apache/storm/blobstore/BlobStore.java   |  2 +-
 .../storm/blobstore/BlobStoreAclHandler.java    |  2 +-
 .../storm/cluster/StormClusterStateImpl.java    |  2 +-
 .../storm/container/cgroup/SystemOperation.java |  7 ++--
 .../org/apache/storm/daemon/StormCommon.java    |  2 +-
 .../storm/daemon/supervisor/AdvancedFSOps.java  |  2 +-
 .../supervisor/ClientSupervisorUtils.java       |  2 +-
 .../org/apache/storm/daemon/worker/Worker.java  |  4 +--
 .../dependency/DependencyBlobStoreUtils.java    |  2 +-
 .../org/apache/storm/executor/TupleInfo.java    |  4 +--
 .../apache/storm/messaging/netty/SaslUtils.java |  2 +-
 .../kerberos/KerberosSaslTransportPlugin.java   |  2 +-
 .../org/apache/storm/task/TopologyContext.java  |  2 +-
 .../jvm/org/apache/storm/testing/TmpPath.java   |  2 +-
 .../storm/topology/ConfigurableTopology.java    |  2 +-
 .../trident/drpc/ReturnResultsReducer.java      |  2 +-
 .../trident/operation/impl/ChainedResult.java   |  2 +-
 .../org/apache/storm/trident/planner/Node.java  |  5 ++-
 .../apache/storm/trident/state/OpaqueValue.java |  2 +-
 .../storm/trident/state/TransactionalValue.java |  3 +-
 .../trident/topology/TridentBoltExecutor.java   |  2 +-
 .../topology/TridentTopologyBuilder.java        |  4 +--
 .../apache/storm/trident/tuple/ComboList.java   |  3 +-
 .../storm/trident/tuple/ValuePointer.java       |  2 +-
 .../trident/windowing/WindowsStateUpdater.java  |  2 +-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |  3 +-
 .../org/apache/storm/utils/CuratorUtils.java    |  2 +-
 .../jvm/org/apache/storm/utils/LocalState.java  |  2 +-
 .../org/apache/storm/utils/NimbusClient.java    |  2 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |  4 +--
 .../org/apache/storm/utils/VersionedStore.java  |  2 +-
 .../LocalAssignmentsBackendTest.java            |  3 +-
 .../apache/storm/security/auth/AutoSSLTest.java |  2 +-
 storm-server/pom.xml                            | 13 +++++++-
 40 files changed, 98 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/examples/storm-loadgen/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml
index c0a5536..7d1a3af 100644
--- a/examples/storm-loadgen/pom.xml
+++ b/examples/storm-loadgen/pom.xml
@@ -71,6 +71,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+      <dependency>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+      </dependency>
   </dependencies>
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index acb041b..54043a7 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -129,6 +129,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/external/storm-kafka-migration/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-migration/pom.xml b/external/storm-kafka-migration/pom.xml
index c935954..5b0d212 100644
--- a/external/storm-kafka-migration/pom.xml
+++ b/external/storm-kafka-migration/pom.xml
@@ -70,6 +70,10 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 0131ff2..f0e95ae 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -71,6 +71,20 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -93,9 +107,12 @@
                     <minimizeJar>false</minimizeJar>
                     <artifactSet>
                         <includes>
-                                <include>com.google.guava:guava</include>
-                                <include>org.apache.curator:*</include>
-                                <include>org.apache.zookeeper:zookeeper</include>
+                            <include>com.google.guava:guava</include>
+                            <include>org.apache.curator:*</include>
+                            <include>org.apache.zookeeper:zookeeper</include>
+                            <include>commons-io:commons-io</include>
+                            <include>commons-lang:commons-lang</include>
+                            <include>commons-collections:commons-collections</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -115,6 +132,18 @@
                             <pattern>org.apache.zookeeper</pattern>
                             <shadedPattern>org.apache.storm.shade.org.apache.zookeeper</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.io</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.apache.commons.io</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.lang</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.apache.commons.lang</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.collections</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.apache.commons.collections</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 37ad5c7..6310b2b 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -94,22 +94,6 @@
             </exclusions>
         </dependency>
 
-        <!-- commons -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-
         <!-- jctools -->
         <dependency>
             <groupId>org.jctools</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
index 7f468d5..1c349f9 100644
--- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
+++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.dependency.DependencyPropertiesParser;
 import org.apache.storm.dependency.DependencyUploader;
 import org.apache.storm.generated.AlreadyAliveException;
@@ -41,6 +40,7 @@ import org.apache.storm.generated.TopologyInitialStatus;
 import org.apache.storm.hooks.SubmitterHookException;
 import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.IAutoCredentials;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.utils.BufferFileInputStream;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.Utils;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
index 3f3dfde..87a8331 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
@@ -23,7 +23,6 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.regex.Pattern;
 import javax.security.auth.Subject;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.daemon.Shutdownable;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.KeyAlreadyExistsException;
@@ -32,6 +31,7 @@ import org.apache.storm.generated.ReadableBlobMeta;
 import org.apache.storm.generated.SettableBlobMeta;
 import org.apache.storm.nimbus.ILeaderElector;
 import org.apache.storm.nimbus.NimbusInfo;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.utils.ConfigUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
index 8d57e28..3b59022 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.security.auth.Subject;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.generated.AccessControl;
 import org.apache.storm.generated.AccessControlType;
@@ -31,6 +30,7 @@ import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.IGroupMappingServiceProvider;
 import org.apache.storm.security.auth.IPrincipalToLocal;
 import org.apache.storm.security.auth.NimbusPrincipal;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.utils.WrappedAuthorizationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java b/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
index 93dbdb7..69d25f4 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
@@ -23,7 +23,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.assignments.ILocalAssignmentsBackend;
 import org.apache.storm.callback.ZKStateChangedCallback;
 import org.apache.storm.generated.Assignment;
@@ -42,6 +41,7 @@ import org.apache.storm.generated.StormBase;
 import org.apache.storm.generated.SupervisorInfo;
 import org.apache.storm.generated.WorkerTokenServiceType;
 import org.apache.storm.nimbus.NimbusInfo;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.shade.org.apache.curator.framework.state.ConnectionState;
 import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
 import org.apache.storm.shade.org.apache.zookeeper.Watcher;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java b/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
index 0a35aeb..a20b828 100644
--- a/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
+++ b/storm-client/src/jvm/org/apache/storm/container/cgroup/SystemOperation.java
@@ -14,7 +14,8 @@ package org.apache.storm.container.cgroup;
 
 import java.io.IOException;
 import java.nio.channels.ClosedByInterruptException;
-import org.apache.commons.io.IOUtils;
+import org.apache.storm.shade.com.google.common.base.Charsets;
+import org.apache.storm.shade.org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,8 +55,8 @@ public class SystemOperation {
         Process process = new ProcessBuilder(new String[]{ "/bin/bash", "-c", cmd }).start();
         try {
             process.waitFor();
-            String output = IOUtils.toString(process.getInputStream());
-            String errorOutput = IOUtils.toString(process.getErrorStream());
+            String output = IOUtils.toString(process.getInputStream(), Charsets.UTF_8);
+            String errorOutput = IOUtils.toString(process.getErrorStream(), Charsets.UTF_8);
             LOG.debug("Shell Output: {}", output);
             if (errorOutput.length() != 0) {
                 LOG.error("Shell Error Output: {}", errorOutput);

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java b/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
index e3b60c2..6951165 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.Constants;
 import org.apache.storm.Thrift;
@@ -42,6 +41,7 @@ import org.apache.storm.metric.SystemBolt;
 import org.apache.storm.metric.filter.FilterByMetricName;
 import org.apache.storm.metric.util.DataPointExpander;
 import org.apache.storm.security.auth.IAuthorizer;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.task.IBolt;
 import org.apache.storm.task.WorkerTopologyContext;
 import org.apache.storm.tuple.Fields;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
index 904d759..5cd04f7 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
@@ -36,8 +36,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.io.FileUtils;
 import org.apache.storm.Config;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.Utils;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
index 96f9da3..987e6e9 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.Utils;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
index 8c8c7a5..291cba8 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
@@ -26,8 +26,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.security.auth.Subject;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.storm.Config;
 import org.apache.storm.Constants;
 import org.apache.storm.cluster.ClusterStateContext;
@@ -54,6 +52,8 @@ import org.apache.storm.metrics2.StormMetricRegistry;
 import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.IAutoCredentials;
 import org.apache.storm.shade.com.google.common.base.Preconditions;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
+import org.apache.storm.shade.org.apache.commons.lang.ObjectUtils;
 import org.apache.storm.stats.StatsUtil;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.LocalState;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/dependency/DependencyBlobStoreUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/dependency/DependencyBlobStoreUtils.java b/storm-client/src/jvm/org/apache/storm/dependency/DependencyBlobStoreUtils.java
index d3e96d4..738af9b 100644
--- a/storm-client/src/jvm/org/apache/storm/dependency/DependencyBlobStoreUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/dependency/DependencyBlobStoreUtils.java
@@ -19,8 +19,8 @@
 package org.apache.storm.dependency;
 
 import java.util.UUID;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.shade.com.google.common.io.Files;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 
 public class DependencyBlobStoreUtils {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/executor/TupleInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/executor/TupleInfo.java b/storm-client/src/jvm/org/apache/storm/executor/TupleInfo.java
index 4b9b74f..7c2a5ee 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/TupleInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/TupleInfo.java
@@ -14,8 +14,8 @@ package org.apache.storm.executor;
 
 import java.io.Serializable;
 import java.util.List;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringStyle;
 
 public class TupleInfo implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
index ff231ef..7efd1b1 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
@@ -17,8 +17,8 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.security.sasl.Sasl;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.Charsets;
 import org.apache.storm.Config;
+import org.apache.storm.shade.com.google.common.base.Charsets;
 
 class SaslUtils {
     public static final String KERBEROS = "GSSAPI";

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index a5c5c6b..382190e 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -27,7 +27,6 @@ import javax.security.auth.kerberos.KerberosTicket;
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginException;
 import javax.security.sasl.Sasl;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.generated.WorkerToken;
 import org.apache.storm.messaging.netty.Login;
 import org.apache.storm.security.auth.ClientAuthUtils;
@@ -35,6 +34,7 @@ import org.apache.storm.security.auth.sasl.SaslTransportPlugin;
 import org.apache.storm.security.auth.sasl.SimpleSaslServerCallbackHandler;
 import org.apache.storm.security.auth.workertoken.WorkerTokenAuthorizer;
 import org.apache.storm.security.auth.workertoken.WorkerTokenClientCallbackHandler;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.shade.org.apache.zookeeper.server.auth.KerberosName;
 import org.apache.thrift.transport.TSaslClientTransport;
 import org.apache.thrift.transport.TSaslServerTransport;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java b/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
index fcdb707..0c20e30 100644
--- a/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
+++ b/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.lang.NotImplementedException;
 import org.apache.storm.generated.GlobalStreamId;
 import org.apache.storm.generated.Grouping;
 import org.apache.storm.generated.StormTopology;
@@ -35,6 +34,7 @@ import org.apache.storm.metric.api.IMetric;
 import org.apache.storm.metric.api.IReducer;
 import org.apache.storm.metric.api.ReducedMetric;
 import org.apache.storm.metrics2.StormMetricRegistry;
+import org.apache.storm.shade.org.apache.commons.lang.NotImplementedException;
 import org.apache.storm.state.ISubscribedState;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.utils.Utils;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java b/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
index 56bd385..92bb591 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
@@ -13,7 +13,7 @@
 package org.apache.storm.testing;
 
 import java.io.File;
-import org.apache.commons.io.FileUtils;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.apache.storm.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/topology/ConfigurableTopology.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/ConfigurableTopology.java b/storm-client/src/jvm/org/apache/storm/topology/ConfigurableTopology.java
index 593461d..c813573 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/ConfigurableTopology.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/ConfigurableTopology.java
@@ -28,9 +28,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.StormSubmitter;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.utils.Utils;
 import org.yaml.snakeyaml.Yaml;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java b/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
index 061e878..c254fb3 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
@@ -16,11 +16,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.Config;
 import org.apache.storm.drpc.DRPCInvocationsClient;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.DistributedRPCInvocations;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.trident.drpc.ReturnResultsReducer.ReturnResultsState;
 import org.apache.storm.trident.operation.MultiReducer;
 import org.apache.storm.trident.operation.TridentCollector;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedResult.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedResult.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedResult.java
index 8c1ed73..aa5e31e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedResult.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedResult.java
@@ -12,7 +12,7 @@
 
 package org.apache.storm.trident.operation.impl;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.trident.operation.TridentCollector;
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/planner/Node.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/Node.java b/storm-client/src/jvm/org/apache/storm/trident/planner/Node.java
index a15e641..7d4aa77 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/Node.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/Node.java
@@ -15,12 +15,11 @@ package org.apache.storm.trident.planner;
 import java.io.Serializable;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringStyle;
 import org.apache.storm.trident.operation.DefaultResourceDeclarer;
 import org.apache.storm.tuple.Fields;
 
-
 public class Node extends DefaultResourceDeclarer<Node> implements Serializable {
     private static final AtomicInteger INDEX = new AtomicInteger(0);
     public String name = null;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/state/OpaqueValue.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/OpaqueValue.java b/storm-client/src/jvm/org/apache/storm/trident/state/OpaqueValue.java
index 63825bd..fa08763 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/OpaqueValue.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/OpaqueValue.java
@@ -12,7 +12,7 @@
 
 package org.apache.storm.trident.state;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 
 public class OpaqueValue<T> {
     Long currTxid;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/state/TransactionalValue.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/TransactionalValue.java b/storm-client/src/jvm/org/apache/storm/trident/state/TransactionalValue.java
index cb74b9e..bd82b26 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/TransactionalValue.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/TransactionalValue.java
@@ -12,8 +12,7 @@
 
 package org.apache.storm.trident.state;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 
 public class TransactionalValue<T> {
     T val;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
index c404597..036bf7f 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
@@ -20,12 +20,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.Config;
 import org.apache.storm.coordination.BatchOutputCollector;
 import org.apache.storm.coordination.BatchOutputCollectorImpl;
 import org.apache.storm.generated.GlobalStreamId;
 import org.apache.storm.generated.Grouping;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.task.IOutputCollector;
 import org.apache.storm.task.OutputCollector;
 import org.apache.storm.task.TopologyContext;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
index 5ef14f5..bbe5d7e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
@@ -18,8 +18,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 import org.apache.storm.Config;
 import org.apache.storm.generated.GlobalStreamId;
 import org.apache.storm.generated.Grouping;
@@ -27,6 +25,8 @@ import org.apache.storm.generated.SharedMemory;
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.grouping.CustomStreamGrouping;
 import org.apache.storm.grouping.PartialKeyGrouping;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringStyle;
 import org.apache.storm.topology.BaseConfigurationDeclarer;
 import org.apache.storm.topology.BoltDeclarer;
 import org.apache.storm.topology.IRichSpout;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java b/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
index 878101a..24cbb67 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
@@ -15,8 +15,7 @@ package org.apache.storm.trident.tuple;
 import java.io.Serializable;
 import java.util.AbstractList;
 import java.util.List;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 
 public class ComboList extends AbstractList<Object> {
     Pointer[] _index;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/tuple/ValuePointer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/tuple/ValuePointer.java b/storm-client/src/jvm/org/apache/storm/trident/tuple/ValuePointer.java
index 5f4c46c..1ff1b16 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/tuple/ValuePointer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/tuple/ValuePointer.java
@@ -14,7 +14,7 @@ package org.apache.storm.trident.tuple;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.tuple.Fields;
 
 public class ValuePointer {

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
index 62dd178..58e350e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
@@ -14,8 +14,8 @@ package org.apache.storm.trident.windowing;
 
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.IllegalClassException;
 import org.apache.storm.shade.com.google.common.collect.Lists;
+import org.apache.storm.shade.org.apache.commons.lang.IllegalClassException;
 import org.apache.storm.topology.FailedException;
 import org.apache.storm.trident.operation.TridentCollector;
 import org.apache.storm.trident.operation.TridentOperationContext;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
index efb6dd7..4c34e0f 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -24,13 +24,12 @@ import java.util.Map;
 import java.util.Random;
 import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
-import org.apache.commons.io.FileUtils;
 import org.apache.storm.Config;
 import org.apache.storm.daemon.supervisor.AdvancedFSOps;
 import org.apache.storm.generated.StormTopology;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.apache.storm.validation.ConfigValidation;
 
-
 public class ConfigUtils {
     public static final String FILE_SEPARATOR = File.separator;
     public final static String RESOURCES_SUBDIR = "resources";

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java b/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
index a187b0a..9cfb9e1 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
@@ -21,8 +21,8 @@ package org.apache.storm.utils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.shade.org.apache.curator.ensemble.exhibitor.DefaultExhibitorRestClient;
 import org.apache.storm.shade.org.apache.curator.ensemble.exhibitor.ExhibitorEnsembleProvider;
 import org.apache.storm.shade.org.apache.curator.ensemble.exhibitor.Exhibitors;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/LocalState.java b/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
index 85eebc2..ccce909 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.io.FileUtils;
 import org.apache.storm.generated.LSApprovedWorkers;
 import org.apache.storm.generated.LSSupervisorAssignments;
 import org.apache.storm.generated.LSSupervisorId;
@@ -29,6 +28,7 @@ import org.apache.storm.generated.LSWorkerHeartbeat;
 import org.apache.storm.generated.LocalAssignment;
 import org.apache.storm.generated.LocalStateData;
 import org.apache.storm.generated.ThriftSerializedObject;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TDeserializer;
 import org.apache.thrift.TSerializer;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
index 7568a7e..876f25f 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -16,7 +16,6 @@ import java.security.Principal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.generated.Nimbus;
 import org.apache.storm.generated.NimbusSummary;
@@ -24,6 +23,7 @@ import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.shade.com.google.common.collect.Lists;
+import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 051df17..0926e47 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -65,8 +65,6 @@ import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import javax.security.auth.Subject;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.input.ClassLoaderObjectInputStream;
 import org.apache.storm.Config;
 import org.apache.storm.blobstore.BlobStore;
 import org.apache.storm.blobstore.ClientBlobStore;
@@ -89,6 +87,8 @@ import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.shade.com.google.common.collect.Lists;
 import org.apache.storm.shade.com.google.common.collect.MapDifference;
 import org.apache.storm.shade.com.google.common.collect.Maps;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
+import org.apache.storm.shade.org.apache.commons.io.input.ClassLoaderObjectInputStream;
 import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
 import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.shade.org.apache.zookeeper.data.Id;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/src/jvm/org/apache/storm/utils/VersionedStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/VersionedStore.java b/storm-client/src/jvm/org/apache/storm/utils/VersionedStore.java
index 9c2deac..329ebbc 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/VersionedStore.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/VersionedStore.java
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import org.apache.commons.io.FileUtils;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 
 public class VersionedStore {
     private static final String FINISHED_VERSION_SUFFIX = ".version";

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java b/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java
index 4c89dfc..0ec1334 100644
--- a/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java
+++ b/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java
@@ -24,15 +24,14 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.collections.map.HashedMap;
 import org.apache.storm.generated.Assignment;
 import org.apache.storm.generated.NodeInfo;
+import org.apache.storm.shade.org.apache.commons.collections.map.HashedMap;
 import org.apache.storm.utils.ConfigUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-
 public class LocalAssignmentsBackendTest {
 
     @Test

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java
index 8213d7b..62de6ac 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import javax.security.auth.Subject;
-import org.apache.commons.io.FileUtils;
+import org.apache.storm.shade.org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/storm/blob/62f9568e/storm-server/pom.xml
----------------------------------------------------------------------
diff --git a/storm-server/pom.xml b/storm-server/pom.xml
index 77cba23..ef8073e 100644
--- a/storm-server/pom.xml
+++ b/storm-server/pom.xml
@@ -91,7 +91,18 @@
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
     </dependencies>
 
     <build>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java b/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
index 1f8c08f..3ab05ca 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ClusterSummary.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterSummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterSummary");
+public class ClusterSummary implements org.apache.storm.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterSummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ClusterSummary");
 
-  private static final org.apache.thrift.protocol.TField SUPERVISORS_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisors", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField NIMBUS_UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("nimbus_uptime_secs", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField TOPOLOGIES_FIELD_DESC = new org.apache.thrift.protocol.TField("topologies", org.apache.thrift.protocol.TType.LIST, (short)3);
-  private static final org.apache.thrift.protocol.TField NIMBUSES_FIELD_DESC = new org.apache.thrift.protocol.TField("nimbuses", org.apache.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField SUPERVISORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("supervisors", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NIMBUS_UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("nimbus_uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGIES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topologies", org.apache.storm.thrift.protocol.TType.LIST, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField NIMBUSES_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("nimbuses", org.apache.storm.thrift.protocol.TType.LIST, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ClusterSummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ClusterSummaryTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ClusterSummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ClusterSummaryTupleSchemeFactory();
 
   private java.util.List<SupervisorSummary> supervisors; // required
   private int nimbus_uptime_secs; // optional
@@ -42,7 +42,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
   private java.util.List<NimbusSummary> nimbuses; // 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 {
     SUPERVISORS((short)1, "supervisors"),
     NIMBUS_UPTIME_SECS((short)2, "nimbus_uptime_secs"),
     TOPOLOGIES((short)3, "topologies"),
@@ -112,22 +112,22 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
   private static final int __NIMBUS_UPTIME_SECS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.NIMBUS_UPTIME_SECS};
-  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.SUPERVISORS, new org.apache.thrift.meta_data.FieldMetaData("supervisors", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, SupervisorSummary.class))));
-    tmpMap.put(_Fields.NIMBUS_UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("nimbus_uptime_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOPOLOGIES, new org.apache.thrift.meta_data.FieldMetaData("topologies", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, TopologySummary.class))));
-    tmpMap.put(_Fields.NIMBUSES, new org.apache.thrift.meta_data.FieldMetaData("nimbuses", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, NimbusSummary.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.SUPERVISORS, new org.apache.storm.thrift.meta_data.FieldMetaData("supervisors", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SupervisorSummary.class))));
+    tmpMap.put(_Fields.NIMBUS_UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("nimbus_uptime_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOPOLOGIES, new org.apache.storm.thrift.meta_data.FieldMetaData("topologies", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, TopologySummary.class))));
+    tmpMap.put(_Fields.NIMBUSES, new org.apache.storm.thrift.meta_data.FieldMetaData("nimbuses", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NimbusSummary.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterSummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterSummary.class, metaDataMap);
   }
 
   public ClusterSummary() {
@@ -236,16 +236,16 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
   }
 
   public void unset_nimbus_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field nimbus_uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_nimbus_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID);
   }
 
   public void set_nimbus_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID, value);
   }
 
   public int get_topologies_size() {
@@ -488,7 +488,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       return lastComparison;
     }
     if (is_set_supervisors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisors, other.supervisors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.supervisors, other.supervisors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -498,7 +498,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       return lastComparison;
     }
     if (is_set_nimbus_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nimbus_uptime_secs, other.nimbus_uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.nimbus_uptime_secs, other.nimbus_uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -508,7 +508,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       return lastComparison;
     }
     if (is_set_topologies()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topologies, other.topologies);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topologies, other.topologies);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -518,7 +518,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       return lastComparison;
     }
     if (is_set_nimbuses()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nimbuses, other.nimbuses);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.nimbuses, other.nimbuses);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -530,11 +530,11 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
     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);
   }
 
@@ -576,18 +576,18 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
     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_supervisors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'supervisors' is unset! Struct:" + toString());
     }
 
     if (!is_set_topologies()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topologies' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topologies' is unset! Struct:" + toString());
     }
 
     if (!is_set_nimbuses()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'nimbuses' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'nimbuses' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -595,8 +595,8 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
 
   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);
     }
   }
@@ -605,34 +605,34 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
     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 ClusterSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ClusterSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ClusterSummaryStandardScheme getScheme() {
       return new ClusterSummaryStandardScheme();
     }
   }
 
-  private static class ClusterSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<ClusterSummary> {
+  private static class ClusterSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ClusterSummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterSummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ClusterSummary 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: // SUPERVISORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list136 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list136 = iprot.readListBegin();
                 struct.supervisors = new java.util.ArrayList<SupervisorSummary>(_list136.size);
                 SupervisorSummary _elem137;
                 for (int _i138 = 0; _i138 < _list136.size; ++_i138)
@@ -645,21 +645,21 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
               }
               struct.set_supervisors_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: // NIMBUS_UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.nimbus_uptime_secs = iprot.readI32();
               struct.set_nimbus_uptime_secs_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: // TOPOLOGIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list139 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list139 = iprot.readListBegin();
                 struct.topologies = new java.util.ArrayList<TopologySummary>(_list139.size);
                 TopologySummary _elem140;
                 for (int _i141 = 0; _i141 < _list139.size; ++_i141)
@@ -672,13 +672,13 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
               }
               struct.set_topologies_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: // NIMBUSES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list142 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list142 = iprot.readListBegin();
                 struct.nimbuses = new java.util.ArrayList<NimbusSummary>(_list142.size);
                 NimbusSummary _elem143;
                 for (int _i144 = 0; _i144 < _list142.size; ++_i144)
@@ -691,11 +691,11 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
               }
               struct.set_nimbuses_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();
       }
@@ -703,14 +703,14 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterSummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ClusterSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.supervisors != null) {
         oprot.writeFieldBegin(SUPERVISORS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.supervisors.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.supervisors.size()));
           for (SupervisorSummary _iter145 : struct.supervisors)
           {
             _iter145.write(oprot);
@@ -727,7 +727,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       if (struct.topologies != null) {
         oprot.writeFieldBegin(TOPOLOGIES_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.topologies.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.topologies.size()));
           for (TopologySummary _iter146 : struct.topologies)
           {
             _iter146.write(oprot);
@@ -739,7 +739,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       if (struct.nimbuses != null) {
         oprot.writeFieldBegin(NIMBUSES_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.nimbuses.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.nimbuses.size()));
           for (NimbusSummary _iter147 : struct.nimbuses)
           {
             _iter147.write(oprot);
@@ -754,17 +754,17 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
 
   }
 
-  private static class ClusterSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ClusterSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ClusterSummaryTupleScheme getScheme() {
       return new ClusterSummaryTupleScheme();
     }
   }
 
-  private static class ClusterSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<ClusterSummary> {
+  private static class ClusterSummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ClusterSummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ClusterSummary 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, ClusterSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.supervisors.size());
         for (SupervisorSummary _iter148 : struct.supervisors)
@@ -797,10 +797,10 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ClusterSummary 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, ClusterSummary 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 _list151 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list151 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.supervisors = new java.util.ArrayList<SupervisorSummary>(_list151.size);
         SupervisorSummary _elem152;
         for (int _i153 = 0; _i153 < _list151.size; ++_i153)
@@ -812,7 +812,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       }
       struct.set_supervisors_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list154 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list154 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.topologies = new java.util.ArrayList<TopologySummary>(_list154.size);
         TopologySummary _elem155;
         for (int _i156 = 0; _i156 < _list154.size; ++_i156)
@@ -824,7 +824,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
       }
       struct.set_topologies_isSet(true);
       {
-        org.apache.thrift.protocol.TList _list157 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list157 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.nimbuses = new java.util.ArrayList<NimbusSummary>(_list157.size);
         NimbusSummary _elem158;
         for (int _i159 = 0; _i159 < _list157.size; ++_i159)
@@ -843,8 +843,8 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
     }
   }
 
-  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/ClusterWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java
index 3c2d031..ba95235 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWorkerHeartbeat, ClusterWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterWorkerHeartbeat> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterWorkerHeartbeat");
+public class ClusterWorkerHeartbeat implements org.apache.storm.thrift.TBase<ClusterWorkerHeartbeat, ClusterWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterWorkerHeartbeat> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ClusterWorkerHeartbeat");
 
-  private static final org.apache.thrift.protocol.TField STORM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storm_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField EXECUTOR_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_stats", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField STORM_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("storm_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTOR_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executor_stats", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_secs", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ClusterWorkerHeartbeatStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ClusterWorkerHeartbeatTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ClusterWorkerHeartbeatStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ClusterWorkerHeartbeatTupleSchemeFactory();
 
   private java.lang.String storm_id; // required
   private java.util.Map<ExecutorInfo,ExecutorStats> executor_stats; // required
@@ -42,7 +42,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
   private int uptime_secs; // 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 {
     STORM_ID((short)1, "storm_id"),
     EXECUTOR_STATS((short)2, "executor_stats"),
     TIME_SECS((short)3, "time_secs"),
@@ -112,21 +112,21 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
   private static final int __TIME_SECS_ISSET_ID = 0;
   private static final int __UPTIME_SECS_ISSET_ID = 1;
   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.STORM_ID, new org.apache.thrift.meta_data.FieldMetaData("storm_id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.EXECUTOR_STATS, new org.apache.thrift.meta_data.FieldMetaData("executor_stats", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorInfo.class), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorStats.class))));
-    tmpMap.put(_Fields.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.STORM_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("storm_id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.EXECUTOR_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("executor_stats", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorInfo.class), 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorStats.class))));
+    tmpMap.put(_Fields.TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("time_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterWorkerHeartbeat.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterWorkerHeartbeat.class, metaDataMap);
   }
 
   public ClusterWorkerHeartbeat() {
@@ -255,16 +255,16 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
   }
 
   public void unset_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   public void set_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -277,16 +277,16 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -449,7 +449,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       return lastComparison;
     }
     if (is_set_storm_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storm_id, other.storm_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.storm_id, other.storm_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -459,7 +459,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       return lastComparison;
     }
     if (is_set_executor_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_stats, other.executor_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executor_stats, other.executor_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -469,7 +469,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       return lastComparison;
     }
     if (is_set_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -479,7 +479,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -491,11 +491,11 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
     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);
   }
 
@@ -531,22 +531,22 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
     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_storm_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'storm_id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'storm_id' is unset! Struct:" + toString());
     }
 
     if (!is_set_executor_stats()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executor_stats' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executor_stats' is unset! Struct:" + toString());
     }
 
     if (!is_set_time_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_uptime_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -554,8 +554,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
 
   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);
     }
   }
@@ -564,42 +564,42 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
     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 ClusterWorkerHeartbeatStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ClusterWorkerHeartbeatStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ClusterWorkerHeartbeatStandardScheme getScheme() {
       return new ClusterWorkerHeartbeatStandardScheme();
     }
   }
 
-  private static class ClusterWorkerHeartbeatStandardScheme extends org.apache.thrift.scheme.StandardScheme<ClusterWorkerHeartbeat> {
+  private static class ClusterWorkerHeartbeatStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ClusterWorkerHeartbeat> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterWorkerHeartbeat struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ClusterWorkerHeartbeat 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: // STORM_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.storm_id = iprot.readString();
               struct.set_storm_id_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: // EXECUTOR_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map772 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map772 = iprot.readMapBegin();
                 struct.executor_stats = new java.util.HashMap<ExecutorInfo,ExecutorStats>(2*_map772.size);
                 ExecutorInfo _key773;
                 ExecutorStats _val774;
@@ -615,27 +615,27 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
               }
               struct.set_executor_stats_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: // TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.time_secs = iprot.readI32();
               struct.set_time_secs_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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();
       }
@@ -643,7 +643,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterWorkerHeartbeat struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ClusterWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -655,7 +655,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
       if (struct.executor_stats != null) {
         oprot.writeFieldBegin(EXECUTOR_STATS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.executor_stats.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, struct.executor_stats.size()));
           for (java.util.Map.Entry<ExecutorInfo, ExecutorStats> _iter776 : struct.executor_stats.entrySet())
           {
             _iter776.getKey().write(oprot);
@@ -677,17 +677,17 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
 
   }
 
-  private static class ClusterWorkerHeartbeatTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ClusterWorkerHeartbeatTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ClusterWorkerHeartbeatTupleScheme getScheme() {
       return new ClusterWorkerHeartbeatTupleScheme();
     }
   }
 
-  private static class ClusterWorkerHeartbeatTupleScheme extends org.apache.thrift.scheme.TupleScheme<ClusterWorkerHeartbeat> {
+  private static class ClusterWorkerHeartbeatTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ClusterWorkerHeartbeat> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartbeat 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, ClusterWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.storm_id);
       {
         oprot.writeI32(struct.executor_stats.size());
@@ -702,12 +702,12 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartbeat 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, ClusterWorkerHeartbeat struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.storm_id = iprot.readString();
       struct.set_storm_id_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map778 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map778 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.executor_stats = new java.util.HashMap<ExecutorInfo,ExecutorStats>(2*_map778.size);
         ExecutorInfo _key779;
         ExecutorStats _val780;
@@ -728,8 +728,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
     }
   }
 
-  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/CommonAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java
index 44be3cc..5ede50d 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/CommonAggregateStats.java
@@ -25,19 +25,19 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggregateStats, CommonAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<CommonAggregateStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommonAggregateStats");
+public class CommonAggregateStats implements org.apache.storm.thrift.TBase<CommonAggregateStats, CommonAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<CommonAggregateStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("CommonAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.I64, (short)3);
-  private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.I64, (short)4);
-  private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.I64, (short)5);
-  private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.I64, (short)6);
-  private static final org.apache.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("resources_map", org.apache.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_executors", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_tasks", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("emitted", org.apache.storm.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("transferred", org.apache.storm.thrift.protocol.TType.I64, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("acked", org.apache.storm.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("failed", org.apache.storm.thrift.protocol.TType.I64, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField RESOURCES_MAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("resources_map", org.apache.storm.thrift.protocol.TType.MAP, (short)7);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CommonAggregateStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CommonAggregateStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CommonAggregateStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CommonAggregateStatsTupleSchemeFactory();
 
   private int num_executors; // optional
   private int num_tasks; // optional
@@ -48,7 +48,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   private java.util.Map<java.lang.String,java.lang.Double> resources_map; // 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 {
     NUM_EXECUTORS((short)1, "num_executors"),
     NUM_TASKS((short)2, "num_tasks"),
     EMITTED((short)3, "emitted"),
@@ -132,27 +132,27 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   private static final int __FAILED_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.NUM_EXECUTORS,_Fields.NUM_TASKS,_Fields.EMITTED,_Fields.TRANSFERRED,_Fields.ACKED,_Fields.FAILED,_Fields.RESOURCES_MAP};
-  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.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_TASKS, new org.apache.thrift.meta_data.FieldMetaData("num_tasks", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.EMITTED, new org.apache.thrift.meta_data.FieldMetaData("emitted", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.TRANSFERRED, new org.apache.thrift.meta_data.FieldMetaData("transferred", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.ACKED, new org.apache.thrift.meta_data.FieldMetaData("acked", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.FAILED, new org.apache.thrift.meta_data.FieldMetaData("failed", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.RESOURCES_MAP, new org.apache.thrift.meta_data.FieldMetaData("resources_map", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
+    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.NUM_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_executors", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_TASKS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_tasks", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.EMITTED, new org.apache.storm.thrift.meta_data.FieldMetaData("emitted", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.TRANSFERRED, new org.apache.storm.thrift.meta_data.FieldMetaData("transferred", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.ACKED, new org.apache.storm.thrift.meta_data.FieldMetaData("acked", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.FAILED, new org.apache.storm.thrift.meta_data.FieldMetaData("failed", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.RESOURCES_MAP, new org.apache.storm.thrift.meta_data.FieldMetaData("resources_map", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CommonAggregateStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CommonAggregateStats.class, metaDataMap);
   }
 
   public CommonAggregateStats() {
@@ -206,16 +206,16 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   }
 
   public void unset_num_executors() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_executors() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   public void set_num_executors_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
   }
 
   public int get_num_tasks() {
@@ -228,16 +228,16 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   }
 
   public void unset_num_tasks() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   /** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_tasks() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   public void set_num_tasks_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
   }
 
   public long get_emitted() {
@@ -250,16 +250,16 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   }
 
   public void unset_emitted() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EMITTED_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __EMITTED_ISSET_ID);
   }
 
   /** Returns true if field emitted is set (has been assigned a value) and false otherwise */
   public boolean is_set_emitted() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EMITTED_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __EMITTED_ISSET_ID);
   }
 
   public void set_emitted_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EMITTED_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __EMITTED_ISSET_ID, value);
   }
 
   public long get_transferred() {
@@ -272,16 +272,16 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   }
 
   public void unset_transferred() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TRANSFERRED_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TRANSFERRED_ISSET_ID);
   }
 
   /** Returns true if field transferred is set (has been assigned a value) and false otherwise */
   public boolean is_set_transferred() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TRANSFERRED_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TRANSFERRED_ISSET_ID);
   }
 
   public void set_transferred_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TRANSFERRED_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TRANSFERRED_ISSET_ID, value);
   }
 
   public long get_acked() {
@@ -294,16 +294,16 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   }
 
   public void unset_acked() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACKED_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ACKED_ISSET_ID);
   }
 
   /** Returns true if field acked is set (has been assigned a value) and false otherwise */
   public boolean is_set_acked() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ACKED_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ACKED_ISSET_ID);
   }
 
   public void set_acked_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ACKED_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ACKED_ISSET_ID, value);
   }
 
   public long get_failed() {
@@ -316,16 +316,16 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
   }
 
   public void unset_failed() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FAILED_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __FAILED_ISSET_ID);
   }
 
   /** Returns true if field failed is set (has been assigned a value) and false otherwise */
   public boolean is_set_failed() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FAILED_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __FAILED_ISSET_ID);
   }
 
   public void set_failed_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FAILED_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __FAILED_ISSET_ID, value);
   }
 
   public int get_resources_map_size() {
@@ -570,19 +570,19 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
 
     hashCode = hashCode * 8191 + ((is_set_emitted()) ? 131071 : 524287);
     if (is_set_emitted())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(emitted);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(emitted);
 
     hashCode = hashCode * 8191 + ((is_set_transferred()) ? 131071 : 524287);
     if (is_set_transferred())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(transferred);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(transferred);
 
     hashCode = hashCode * 8191 + ((is_set_acked()) ? 131071 : 524287);
     if (is_set_acked())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(acked);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(acked);
 
     hashCode = hashCode * 8191 + ((is_set_failed()) ? 131071 : 524287);
     if (is_set_failed())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(failed);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(failed);
 
     hashCode = hashCode * 8191 + ((is_set_resources_map()) ? 131071 : 524287);
     if (is_set_resources_map())
@@ -604,7 +604,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_num_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -614,7 +614,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_num_tasks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -624,7 +624,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_emitted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, other.emitted);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.emitted, other.emitted);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -634,7 +634,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_transferred()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, other.transferred);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.transferred, other.transferred);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -644,7 +644,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_acked()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, other.acked);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.acked, other.acked);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -654,7 +654,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_failed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, other.failed);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.failed, other.failed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -664,7 +664,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       return lastComparison;
     }
     if (is_set_resources_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resources_map, other.resources_map);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.resources_map, other.resources_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -676,11 +676,11 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
     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);
   }
 
@@ -738,15 +738,15 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -755,82 +755,82 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
     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 CommonAggregateStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class CommonAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public CommonAggregateStatsStandardScheme getScheme() {
       return new CommonAggregateStatsStandardScheme();
     }
   }
 
-  private static class CommonAggregateStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<CommonAggregateStats> {
+  private static class CommonAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<CommonAggregateStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, CommonAggregateStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, CommonAggregateStats 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: // NUM_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_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: // NUM_TASKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_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: // EMITTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.emitted = iprot.readI64();
               struct.set_emitted_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: // TRANSFERRED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.transferred = iprot.readI64();
               struct.set_transferred_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: // ACKED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.acked = iprot.readI64();
               struct.set_acked_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: // FAILED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.failed = iprot.readI64();
               struct.set_failed_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: // RESOURCES_MAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map396 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map396 = iprot.readMapBegin();
                 struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map396.size);
                 java.lang.String _key397;
                 double _val398;
@@ -844,11 +844,11 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
               }
               struct.set_resources_map_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();
       }
@@ -856,7 +856,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, CommonAggregateStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, CommonAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -894,7 +894,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
         if (struct.is_set_resources_map()) {
           oprot.writeFieldBegin(RESOURCES_MAP_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter400 : struct.resources_map.entrySet())
             {
               oprot.writeString(_iter400.getKey());
@@ -911,17 +911,17 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
 
   }
 
-  private static class CommonAggregateStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class CommonAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public CommonAggregateStatsTupleScheme getScheme() {
       return new CommonAggregateStatsTupleScheme();
     }
   }
 
-  private static class CommonAggregateStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<CommonAggregateStats> {
+  private static class CommonAggregateStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<CommonAggregateStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStats 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, CommonAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_num_executors()) {
         optionals.set(0);
@@ -976,8 +976,8 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStats 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, CommonAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         struct.num_executors = iprot.readI32();
@@ -1005,7 +1005,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TMap _map402 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map402 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.resources_map = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map402.size);
           java.lang.String _key403;
           double _val404;
@@ -1021,8 +1021,8 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
     }
   }
 
-  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();
   }
 }
 


[04/50] [abbrv] storm git commit: Small config change

Posted by bo...@apache.org.
Small config change


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8a957842
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8a957842
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8a957842

Branch: refs/heads/master
Commit: 8a95784267743ee616d3d9d4ec091d7f8e2c9248
Parents: a8eb4c4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 16 07:32:37 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:12 2018 -0500

----------------------------------------------------------------------
 shaded-deps/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/8a957842/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 305e8e0..f60b524 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -72,7 +72,7 @@
                 </executions>
                 <configuration>
                     <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
-                    <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
+                    <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                     <minimizeJar>false</minimizeJar>
                     <artifactSet>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java b/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java
index f07f9c0..c7d78fc 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Supervisor.java
@@ -34,68 +34,68 @@ public class Supervisor {
      * 
      * @param assignments
      */
-    public void sendSupervisorAssignments(SupervisorAssignments assignments) throws AuthorizationException, org.apache.thrift.TException;
+    public void sendSupervisorAssignments(SupervisorAssignments assignments) throws AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Get local assignment for a storm
      * 
      * @param id
      */
-    public Assignment getLocalAssignmentForStorm(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public Assignment getLocalAssignmentForStorm(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Send worker heartbeat to local supervisor
      * 
      * @param heartbeat
      */
-    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat) throws AuthorizationException, org.apache.thrift.TException;
+    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat) throws AuthorizationException, org.apache.storm.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getLocalAssignmentForStorm(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.thrift.TException;
+    public void getLocalAssignmentForStorm(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
-    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+  public static class Client extends org.apache.storm.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.storm.thrift.TServiceClientFactory<Client> {
       public Factory() {}
-      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
-      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol prot)
+    public Client(org.apache.storm.thrift.protocol.TProtocol prot)
     {
       super(prot, prot);
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+    public Client(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
       super(iprot, oprot);
     }
 
-    public void sendSupervisorAssignments(SupervisorAssignments assignments) throws AuthorizationException, org.apache.thrift.TException
+    public void sendSupervisorAssignments(SupervisorAssignments assignments) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_sendSupervisorAssignments(assignments);
       recv_sendSupervisorAssignments();
     }
 
-    public void send_sendSupervisorAssignments(SupervisorAssignments assignments) throws org.apache.thrift.TException
+    public void send_sendSupervisorAssignments(SupervisorAssignments assignments) throws org.apache.storm.thrift.TException
     {
       sendSupervisorAssignments_args args = new sendSupervisorAssignments_args();
       args.set_assignments(assignments);
       sendBase("sendSupervisorAssignments", args);
     }
 
-    public void recv_sendSupervisorAssignments() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_sendSupervisorAssignments() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       sendSupervisorAssignments_result result = new sendSupervisorAssignments_result();
       receiveBase(result, "sendSupervisorAssignments");
@@ -105,20 +105,20 @@ public class Supervisor {
       return;
     }
 
-    public Assignment getLocalAssignmentForStorm(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public Assignment getLocalAssignmentForStorm(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_getLocalAssignmentForStorm(id);
       return recv_getLocalAssignmentForStorm();
     }
 
-    public void send_getLocalAssignmentForStorm(java.lang.String id) throws org.apache.thrift.TException
+    public void send_getLocalAssignmentForStorm(java.lang.String id) throws org.apache.storm.thrift.TException
     {
       getLocalAssignmentForStorm_args args = new getLocalAssignmentForStorm_args();
       args.set_id(id);
       sendBase("getLocalAssignmentForStorm", args);
     }
 
-    public Assignment recv_getLocalAssignmentForStorm() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public Assignment recv_getLocalAssignmentForStorm() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result();
       receiveBase(result, "getLocalAssignmentForStorm");
@@ -131,23 +131,23 @@ public class Supervisor {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLocalAssignmentForStorm failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getLocalAssignmentForStorm failed: unknown result");
     }
 
-    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat) throws AuthorizationException, org.apache.thrift.TException
+    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_sendSupervisorWorkerHeartbeat(heartbeat);
       recv_sendSupervisorWorkerHeartbeat();
     }
 
-    public void send_sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat) throws org.apache.thrift.TException
+    public void send_sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat) throws org.apache.storm.thrift.TException
     {
       sendSupervisorWorkerHeartbeat_args args = new sendSupervisorWorkerHeartbeat_args();
       args.set_heartbeat(heartbeat);
       sendBase("sendSupervisorWorkerHeartbeat", args);
     }
 
-    public void recv_sendSupervisorWorkerHeartbeat() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_sendSupervisorWorkerHeartbeat() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result();
       receiveBase(result, "sendSupervisorWorkerHeartbeat");
@@ -158,139 +158,139 @@ public class Supervisor {
     }
 
   }
-  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
-    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
-      private org.apache.thrift.async.TAsyncClientManager clientManager;
-      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
-      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+  public static class AsyncClient extends org.apache.storm.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.storm.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.storm.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.storm.thrift.async.TAsyncClientManager clientManager, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory) {
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
-      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+      public AsyncClient getAsyncClient(org.apache.storm.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
     }
 
-    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+    public AsyncClient(org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.async.TAsyncClientManager clientManager, org.apache.storm.thrift.transport.TNonblockingTransport transport) {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void sendSupervisorAssignments(SupervisorAssignments assignments, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       sendSupervisorAssignments_call method_call = new sendSupervisorAssignments_call(assignments, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class sendSupervisorAssignments_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+    public static class sendSupervisorAssignments_call extends org.apache.storm.thrift.async.TAsyncMethodCall<Void> {
       private SupervisorAssignments assignments;
-      public sendSupervisorAssignments_call(SupervisorAssignments assignments, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public sendSupervisorAssignments_call(SupervisorAssignments assignments, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.assignments = assignments;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("sendSupervisorAssignments", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("sendSupervisorAssignments", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         sendSupervisorAssignments_args args = new sendSupervisorAssignments_args();
         args.set_assignments(assignments);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public Void getResult() throws AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return null;
       }
     }
 
-    public void getLocalAssignmentForStorm(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.thrift.TException {
+    public void getLocalAssignmentForStorm(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       getLocalAssignmentForStorm_call method_call = new getLocalAssignmentForStorm_call(id, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getLocalAssignmentForStorm_call extends org.apache.thrift.async.TAsyncMethodCall<Assignment> {
+    public static class getLocalAssignmentForStorm_call extends org.apache.storm.thrift.async.TAsyncMethodCall<Assignment> {
       private java.lang.String id;
-      public getLocalAssignmentForStorm_call(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getLocalAssignmentForStorm_call(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<Assignment> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.id = id;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLocalAssignmentForStorm", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("getLocalAssignmentForStorm", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         getLocalAssignmentForStorm_args args = new getLocalAssignmentForStorm_args();
         args.set_id(id);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public Assignment getResult() throws NotAliveException, AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public Assignment getResult() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return (new Client(prot)).recv_getLocalAssignmentForStorm();
       }
     }
 
-    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heartbeat, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       sendSupervisorWorkerHeartbeat_call method_call = new sendSupervisorWorkerHeartbeat_call(heartbeat, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class sendSupervisorWorkerHeartbeat_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+    public static class sendSupervisorWorkerHeartbeat_call extends org.apache.storm.thrift.async.TAsyncMethodCall<Void> {
       private SupervisorWorkerHeartbeat heartbeat;
-      public sendSupervisorWorkerHeartbeat_call(SupervisorWorkerHeartbeat heartbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public sendSupervisorWorkerHeartbeat_call(SupervisorWorkerHeartbeat heartbeat, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.heartbeat = heartbeat;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("sendSupervisorWorkerHeartbeat", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("sendSupervisorWorkerHeartbeat", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         sendSupervisorWorkerHeartbeat_args args = new sendSupervisorWorkerHeartbeat_args();
         args.set_heartbeat(heartbeat);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public Void getResult() throws AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public Void getResult() throws AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return null;
       }
     }
 
   }
 
-  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
+  public static class Processor<I extends Iface> extends org.apache.storm.thrift.TBaseProcessor<I> implements org.apache.storm.thrift.TProcessor {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends  org.apache.storm.thrift.TBase>> processMap) {
       processMap.put("sendSupervisorAssignments", new sendSupervisorAssignments());
       processMap.put("getLocalAssignmentForStorm", new getLocalAssignmentForStorm());
       processMap.put("sendSupervisorWorkerHeartbeat", new sendSupervisorWorkerHeartbeat());
       return processMap;
     }
 
-    public static class sendSupervisorAssignments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, sendSupervisorAssignments_args> {
+    public static class sendSupervisorAssignments<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, sendSupervisorAssignments_args> {
       public sendSupervisorAssignments() {
         super("sendSupervisorAssignments");
       }
@@ -308,7 +308,7 @@ public class Supervisor {
         return false;
       }
 
-      public sendSupervisorAssignments_result getResult(I iface, sendSupervisorAssignments_args args) throws org.apache.thrift.TException {
+      public sendSupervisorAssignments_result getResult(I iface, sendSupervisorAssignments_args args) throws org.apache.storm.thrift.TException {
         sendSupervisorAssignments_result result = new sendSupervisorAssignments_result();
         try {
           iface.sendSupervisorAssignments(args.assignments);
@@ -319,7 +319,7 @@ public class Supervisor {
       }
     }
 
-    public static class getLocalAssignmentForStorm<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLocalAssignmentForStorm_args> {
+    public static class getLocalAssignmentForStorm<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, getLocalAssignmentForStorm_args> {
       public getLocalAssignmentForStorm() {
         super("getLocalAssignmentForStorm");
       }
@@ -337,7 +337,7 @@ public class Supervisor {
         return false;
       }
 
-      public getLocalAssignmentForStorm_result getResult(I iface, getLocalAssignmentForStorm_args args) throws org.apache.thrift.TException {
+      public getLocalAssignmentForStorm_result getResult(I iface, getLocalAssignmentForStorm_args args) throws org.apache.storm.thrift.TException {
         getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result();
         try {
           result.success = iface.getLocalAssignmentForStorm(args.id);
@@ -350,7 +350,7 @@ public class Supervisor {
       }
     }
 
-    public static class sendSupervisorWorkerHeartbeat<I extends Iface> extends org.apache.thrift.ProcessFunction<I, sendSupervisorWorkerHeartbeat_args> {
+    public static class sendSupervisorWorkerHeartbeat<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, sendSupervisorWorkerHeartbeat_args> {
       public sendSupervisorWorkerHeartbeat() {
         super("sendSupervisorWorkerHeartbeat");
       }
@@ -368,7 +368,7 @@ public class Supervisor {
         return false;
       }
 
-      public sendSupervisorWorkerHeartbeat_result getResult(I iface, sendSupervisorWorkerHeartbeat_args args) throws org.apache.thrift.TException {
+      public sendSupervisorWorkerHeartbeat_result getResult(I iface, sendSupervisorWorkerHeartbeat_args args) throws org.apache.storm.thrift.TException {
         sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result();
         try {
           iface.sendSupervisorWorkerHeartbeat(args.heartbeat);
@@ -381,24 +381,24 @@ public class Supervisor {
 
   }
 
-  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.storm.thrift.TBaseAsyncProcessor<I> {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.storm.thrift.AsyncProcessFunction<I, ? extends org.apache.storm.thrift.TBase, ?>>()));
     }
 
-    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase, ?>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase, ?>> processMap) {
       processMap.put("sendSupervisorAssignments", new sendSupervisorAssignments());
       processMap.put("getLocalAssignmentForStorm", new getLocalAssignmentForStorm());
       processMap.put("sendSupervisorWorkerHeartbeat", new sendSupervisorWorkerHeartbeat());
       return processMap;
     }
 
-    public static class sendSupervisorAssignments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, sendSupervisorAssignments_args, Void> {
+    public static class sendSupervisorAssignments<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, sendSupervisorAssignments_args, Void> {
       public sendSupervisorAssignments() {
         super("sendSupervisorAssignments");
       }
@@ -407,14 +407,14 @@ public class Supervisor {
         return new sendSupervisorAssignments_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             sendSupervisorAssignments_result result = new sendSupervisorAssignments_result();
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -423,25 +423,25 @@ public class Supervisor {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             sendSupervisorAssignments_result result = new sendSupervisorAssignments_result();
             if (e instanceof AuthorizationException) {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -457,12 +457,12 @@ public class Supervisor {
         return false;
       }
 
-      public void start(I iface, sendSupervisorAssignments_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, sendSupervisorAssignments_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.sendSupervisorAssignments(args.assignments,resultHandler);
       }
     }
 
-    public static class getLocalAssignmentForStorm<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocalAssignmentForStorm_args, Assignment> {
+    public static class getLocalAssignmentForStorm<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, getLocalAssignmentForStorm_args, Assignment> {
       public getLocalAssignmentForStorm() {
         super("getLocalAssignmentForStorm");
       }
@@ -471,15 +471,15 @@ public class Supervisor {
         return new getLocalAssignmentForStorm_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<Assignment> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Assignment>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<Assignment> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<Assignment>() { 
           public void onComplete(Assignment o) {
             getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -488,8 +488,8 @@ public class Supervisor {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             getLocalAssignmentForStorm_result result = new getLocalAssignmentForStorm_result();
             if (e instanceof NotAliveException) {
               result.e = (NotAliveException) e;
@@ -499,18 +499,18 @@ public class Supervisor {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -526,12 +526,12 @@ public class Supervisor {
         return false;
       }
 
-      public void start(I iface, getLocalAssignmentForStorm_args args, org.apache.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, getLocalAssignmentForStorm_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Assignment> resultHandler) throws org.apache.storm.thrift.TException {
         iface.getLocalAssignmentForStorm(args.id,resultHandler);
       }
     }
 
-    public static class sendSupervisorWorkerHeartbeat<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, sendSupervisorWorkerHeartbeat_args, Void> {
+    public static class sendSupervisorWorkerHeartbeat<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, sendSupervisorWorkerHeartbeat_args, Void> {
       public sendSupervisorWorkerHeartbeat() {
         super("sendSupervisorWorkerHeartbeat");
       }
@@ -540,14 +540,14 @@ public class Supervisor {
         return new sendSupervisorWorkerHeartbeat_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result();
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -556,25 +556,25 @@ public class Supervisor {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             sendSupervisorWorkerHeartbeat_result result = new sendSupervisorWorkerHeartbeat_result();
             if (e instanceof AuthorizationException) {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -590,25 +590,25 @@ public class Supervisor {
         return false;
       }
 
-      public void start(I iface, sendSupervisorWorkerHeartbeat_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, sendSupervisorWorkerHeartbeat_args args, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException {
         iface.sendSupervisorWorkerHeartbeat(args.heartbeat,resultHandler);
       }
     }
 
   }
 
-  public static class sendSupervisorAssignments_args implements org.apache.thrift.TBase<sendSupervisorAssignments_args, sendSupervisorAssignments_args._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorAssignments_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sendSupervisorAssignments_args");
+  public static class sendSupervisorAssignments_args implements org.apache.storm.thrift.TBase<sendSupervisorAssignments_args, sendSupervisorAssignments_args._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorAssignments_args>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("sendSupervisorAssignments_args");
 
-    private static final org.apache.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("assignments", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assignments", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorAssignments_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorAssignments_argsTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorAssignments_argsStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorAssignments_argsTupleSchemeFactory();
 
     private SupervisorAssignments assignments; // 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 {
       ASSIGNMENTS((short)1, "assignments");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -666,13 +666,13 @@ public class Supervisor {
     }
 
     // isset id assignments
-    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.ASSIGNMENTS, new org.apache.thrift.meta_data.FieldMetaData("assignments", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SupervisorAssignments.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.ASSIGNMENTS, new org.apache.storm.thrift.meta_data.FieldMetaData("assignments", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SupervisorAssignments.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorAssignments_args.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorAssignments_args.class, metaDataMap);
     }
 
     public sendSupervisorAssignments_args() {
@@ -812,7 +812,7 @@ public class Supervisor {
         return lastComparison;
       }
       if (is_set_assignments()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assignments, other.assignments);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assignments, other.assignments);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -824,11 +824,11 @@ public class Supervisor {
       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);
     }
 
@@ -848,7 +848,7 @@ public class Supervisor {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
       if (assignments != null) {
@@ -858,49 +858,49 @@ public class Supervisor {
 
     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 sendSupervisorAssignments_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class sendSupervisorAssignments_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public sendSupervisorAssignments_argsStandardScheme getScheme() {
         return new sendSupervisorAssignments_argsStandardScheme();
       }
     }
 
-    private static class sendSupervisorAssignments_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<sendSupervisorAssignments_args> {
+    private static class sendSupervisorAssignments_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<sendSupervisorAssignments_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, sendSupervisorAssignments_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, sendSupervisorAssignments_args 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: // ASSIGNMENTS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
                 struct.assignments = new SupervisorAssignments();
                 struct.assignments.read(iprot);
                 struct.set_assignments_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();
         }
@@ -908,7 +908,7 @@ public class Supervisor {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, sendSupervisorAssignments_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, sendSupervisorAssignments_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -923,17 +923,17 @@ public class Supervisor {
 
     }
 
-    private static class sendSupervisorAssignments_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class sendSupervisorAssignments_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public sendSupervisorAssignments_argsTupleScheme getScheme() {
         return new sendSupervisorAssignments_argsTupleScheme();
       }
     }
 
-    private static class sendSupervisorAssignments_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<sendSupervisorAssignments_args> {
+    private static class sendSupervisorAssignments_argsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<sendSupervisorAssignments_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_args 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, sendSupervisorAssignments_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_assignments()) {
           optionals.set(0);
@@ -945,8 +945,8 @@ public class Supervisor {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_args 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, sendSupervisorAssignments_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.assignments = new SupervisorAssignments();
@@ -956,23 +956,23 @@ public class Supervisor {
       }
     }
 
-    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();
     }
   }
 
-  public static class sendSupervisorAssignments_result implements org.apache.thrift.TBase<sendSupervisorAssignments_result, sendSupervisorAssignments_result._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorAssignments_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("sendSupervisorAssignments_result");
+  public static class sendSupervisorAssignments_result implements org.apache.storm.thrift.TBase<sendSupervisorAssignments_result, sendSupervisorAssignments_result._Fields>, java.io.Serializable, Cloneable, Comparable<sendSupervisorAssignments_result>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("sendSupervisorAssignments_result");
 
-    private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("aze", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorAssignments_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorAssignments_resultTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new sendSupervisorAssignments_resultStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new sendSupervisorAssignments_resultTupleSchemeFactory();
 
     private AuthorizationException aze; // 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 {
       AZE((short)1, "aze");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -1030,13 +1030,13 @@ public class Supervisor {
     }
 
     // isset id assignments
-    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.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AuthorizationException.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.AZE, new org.apache.storm.thrift.meta_data.FieldMetaData("aze", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, AuthorizationException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorAssignments_result.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(sendSupervisorAssignments_result.class, metaDataMap);
     }
 
     public sendSupervisorAssignments_result() {
@@ -1176,7 +1176,7 @@ public class Supervisor {
         return lastComparison;
       }
       if (is_set_aze()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.aze, other.aze);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1188,11 +1188,11 @@ public class Supervisor {
       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);
       }
 
@@ -1212,56 +1212,56 @@ public class Supervisor {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 sendSupervisorAssignments_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class sendSupervisorAssignments_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public sendSupervisorAssignments_resultStandardScheme getScheme() {
         return new sendSupervisorAssignments_resultStandardScheme();
       }
     }
 
-    private static class sendSupervisorAssignments_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<sendSupervisorAssignments_result> {
+    private static class sendSupervisorAssignments_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<sendSupervisorAssignments_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, sendSupervisorAssignments_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, sendSupervisorAssignments_result 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: // AZE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
                 struct.aze = new AuthorizationException();
                 struct.aze.read(iprot);
                 struct.set_aze_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();
         }
@@ -1269,7 +1269,7 @@ public class Supervisor {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, sendSupervisorAssignments_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, sendSupervisorAssignments_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1284,17 +1284,17 @@ public class Supervisor {
 
     }
 
-    private static class sendSupervisorAssignments_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class sendSupervisorAssignments_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public sendSupervisorAssignments_resultTupleScheme getScheme() {
         return new sendSupervisorAssignments_resultTupleScheme();
       }
     }
 
-    private static class sendSupervisorAssignments_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<sendSupervisorAssignments_result> {
+    private static class sendSupervisorAssignments_resultTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<sendSupervisorAssignments_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_result 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, sendSupervisorAssignments_result struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_aze()) {
           optionals.set(0);
@@ -1306,8 +1306,8 @@ public class Supervisor {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, sendSupervisorAssignments_result 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, sendSupervisorAssignments_result struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.aze = new AuthorizationException();
@@ -1317,23 +1317,23 @@ public class Supervisor {
       }
     }
 
-    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();
     }
   }
 
-  public static class getLocalAssignmentForStorm_args implements org.apache.thrift.TBase<getLocalAssignmentForStorm_args, getLocalAssignmentForStorm_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLocalAssignmentForStorm_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLocalAssignmentForStorm_args");
+  public static class getLocalAssignmentForStorm_args implements org.apache.storm.thrift.TBase<getLocalAssignmentForStorm_args, getLocalAssignmentForStorm_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLocalAssignmentForStorm_args>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("getLocalAssignmentForStorm_args");
 
-    private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocalAssignmentForStorm_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocalAssignmentForStorm_argsTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocalAssignmentForStorm_argsStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocalAssignmentForStorm_argsTupleSchemeFactory();
 
     private java.lang.String id; // 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 {
       ID((short)1, "id");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -1391,13 +1391,13 @@ public class Supervisor {
     }
 
     // isset id assignments
-    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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      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.ID, new org.apache.storm.thrift.meta_data.FieldMetaData("id", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocalAssignmentForStorm_args.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocalAssignmentForStorm_args.class, metaDataMap);
     }
 
     public getLocalAssignmentForStorm_args() {
@@ -1537,7 +1537,7 @@ public class Supervisor {
         return lastComparison;
       }
       if (is_set_id()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id, other.id);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1549,11 +1549,11 @@ public class Supervisor {
       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);
     }
 
@@ -1573,55 +1573,55 @@ public class Supervisor {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 getLocalAssignmentForStorm_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class getLocalAssignmentForStorm_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public getLocalAssignmentForStorm_argsStandardScheme getScheme() {
         return new getLocalAssignmentForStorm_argsStandardScheme();
       }
     }
 
-    private static class getLocalAssignmentForStorm_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLocalAssignmentForStorm_args> {
+    private static class getLocalAssignmentForStorm_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<getLocalAssignmentForStorm_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getLocalAssignmentForStorm_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, getLocalAssignmentForStorm_args 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: // ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.id = iprot.readString();
                 struct.set_id_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();
         }
@@ -1629,7 +1629,7 @@ public class Supervisor {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getLocalAssignmentForStorm_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, getLocalAssignmentForStorm_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1644,17 +1644,17 @@ public class Supervisor {
 
     }
 
-    private static class getLocalAssignmentForStorm_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class getLocalAssignmentForStorm_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public getLocalAssignmentForStorm_argsTupleScheme getScheme() {
         return new getLocalAssignmentForStorm_argsTupleScheme();
       }
     }
 
-    private static class getLocalAssignmentForStorm_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLocalAssignmentForStorm_args> {
+    private static class getLocalAssignmentForStorm_argsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<getLocalAssignmentForStorm_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getLocalAssignmentForStorm_args 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, getLocalAssignmentForStorm_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_id()) {
           optionals.set(0);
@@ -1666,8 +1666,8 @@ public class Supervisor {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getLocalAssignmentForStorm_args 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, getLocalAssignmentForStorm_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.id = iprot.readString();
@@ -1676,27 +1676,27 @@ public class Supervisor {
       }
     }
 
-    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();
     }
   }
 
-  public static class getLocalAssignmentForStorm_result implements org.apache.thrift.TBase<getLocalAssignmentForStorm_result, getLocalAssignmentForStorm_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLocalAssignmentForStorm_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLocalAssignmentForStorm_result");
+  public static class getLocalAssignmentForStorm_result implements org.apache.storm.thrift.TBase<getLocalAssignmentForStorm_result, getLocalAssignmentForStorm_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLocalAssignmentForStorm_result>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("getLocalAssignmentForStorm_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
-    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.storm.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("success", org.apache.storm.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.storm.thrift.protocol.TField E_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("e", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("aze", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocalAssignmentForStorm_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocalAssignmentForStorm_resultTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocalAssignmentForStorm_resultStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocalAssignmentForStorm_resultTupleSchemeFactory();
 
     private Assignment success; // required
     private NotAliveException e; // required
     private AuthorizationException aze; // 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 {
       SUCCESS((short)0, "success"),
       E((short)1, "e"),
       AZE((short)2, "aze");
@@ -1760,17 +1760,17 @@ public class Supervisor {
     }
 
     // isset id assignments
-    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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Assignment.class)));
-      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NotAliveException.class)));
-      tmpMap.put(_Fields.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AuthorizationException.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.SUCCESS, new org.apache.storm.thrift.meta_data.FieldMetaData("success", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, Assignment.class)));
+      tmpMap.put(_Fields.E, new org.apache.storm.thrift.meta_data.FieldMetaData("e", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, NotAliveException.class)));
+      tmpMap.put(_Fields.AZE, new org.apache.storm.thrift.meta_data.FieldMetaData("aze", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, AuthorizationException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocalAssignmentForStorm_result.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocalAssignmentForStorm_result.class, metaDataMap);
     }
 
     public getLocalAssignmentForStorm_result() {
@@ -2020,7 +2020,7 @@ public class Supervisor {
         return lastComparison;
       }
       if (is_set_success()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2030,7 +2030,7 @@ public class Supervisor {
         return lastComparison;
       }
       if (is_set_e()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, other.e);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.e, other.e);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2040,7 +2040,7 @@ public class Supervisor {
         return lastComparison;
       }
       if (is_set_aze()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.aze, other.aze);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2052,11 +2052,11 @@ public class Supervisor {
       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);
       }
 
@@ -2092,7 +2092,7 @@ public class Supervisor {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
       if (success != null) {
@@ -2102,67 +2102,67 @@ public class Supervisor {
 
     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 getLocalAssignmentForStorm_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class getLocalAssignmentForStorm_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public getLocalAssignmentForStorm_resultStandardScheme getScheme() {
         return new getLocalAssignmentForStorm_resultStandardScheme();
       }
     }
 
-    private static class getLocalAssignmentForStorm_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLocalAssignmentForStorm_result> {
+    private static class getLocalAssignmentForStorm_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<getLocalAssignmentForStorm_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getLocalAssignmentForStorm_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, getLocalAssignmentForStorm_result 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 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
                 struct.success = new Assignment();
                 struct.success.read(iprot);
                 struct.set_success_isSet(true);
               } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                org.apache.storm.thrift.

<TRUNCATED>

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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
index 5b1b034..2ba3193 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/BoltAggregateStats.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregateStats, BoltAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltAggregateStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltAggregateStats");
+public class BoltAggregateStats implements org.apache.storm.thrift.TBase<BoltAggregateStats, BoltAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltAggregateStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("BoltAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField EXECUTE_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("execute_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)1);
-  private static final org.apache.thrift.protocol.TField PROCESS_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("process_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
-  private static final org.apache.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift.protocol.TField("executed", org.apache.thrift.protocol.TType.I64, (short)3);
-  private static final org.apache.thrift.protocol.TField CAPACITY_FIELD_DESC = new org.apache.thrift.protocol.TField("capacity", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTE_LATENCY_MS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("execute_latency_ms", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField PROCESS_LATENCY_MS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("process_latency_ms", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executed", org.apache.storm.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField CAPACITY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("capacity", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BoltAggregateStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BoltAggregateStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BoltAggregateStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BoltAggregateStatsTupleSchemeFactory();
 
   private double execute_latency_ms; // optional
   private double process_latency_ms; // optional
@@ -42,7 +42,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
   private double capacity; // 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 {
     EXECUTE_LATENCY_MS((short)1, "execute_latency_ms"),
     PROCESS_LATENCY_MS((short)2, "process_latency_ms"),
     EXECUTED((short)3, "executed"),
@@ -115,19 +115,19 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
   private static final int __CAPACITY_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.EXECUTE_LATENCY_MS,_Fields.PROCESS_LATENCY_MS,_Fields.EXECUTED,_Fields.CAPACITY};
-  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.EXECUTE_LATENCY_MS, new org.apache.thrift.meta_data.FieldMetaData("execute_latency_ms", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.PROCESS_LATENCY_MS, new org.apache.thrift.meta_data.FieldMetaData("process_latency_ms", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.EXECUTED, new org.apache.thrift.meta_data.FieldMetaData("executed", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.CAPACITY, new org.apache.thrift.meta_data.FieldMetaData("capacity", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.EXECUTE_LATENCY_MS, new org.apache.storm.thrift.meta_data.FieldMetaData("execute_latency_ms", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.PROCESS_LATENCY_MS, new org.apache.storm.thrift.meta_data.FieldMetaData("process_latency_ms", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.EXECUTED, new org.apache.storm.thrift.meta_data.FieldMetaData("executed", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.CAPACITY, new org.apache.storm.thrift.meta_data.FieldMetaData("capacity", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BoltAggregateStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BoltAggregateStats.class, metaDataMap);
   }
 
   public BoltAggregateStats() {
@@ -170,16 +170,16 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
   }
 
   public void unset_execute_latency_ms() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXECUTE_LATENCY_MS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXECUTE_LATENCY_MS_ISSET_ID);
   }
 
   /** Returns true if field execute_latency_ms is set (has been assigned a value) and false otherwise */
   public boolean is_set_execute_latency_ms() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXECUTE_LATENCY_MS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __EXECUTE_LATENCY_MS_ISSET_ID);
   }
 
   public void set_execute_latency_ms_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXECUTE_LATENCY_MS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __EXECUTE_LATENCY_MS_ISSET_ID, value);
   }
 
   public double get_process_latency_ms() {
@@ -192,16 +192,16 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
   }
 
   public void unset_process_latency_ms() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PROCESS_LATENCY_MS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PROCESS_LATENCY_MS_ISSET_ID);
   }
 
   /** Returns true if field process_latency_ms is set (has been assigned a value) and false otherwise */
   public boolean is_set_process_latency_ms() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PROCESS_LATENCY_MS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PROCESS_LATENCY_MS_ISSET_ID);
   }
 
   public void set_process_latency_ms_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PROCESS_LATENCY_MS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PROCESS_LATENCY_MS_ISSET_ID, value);
   }
 
   public long get_executed() {
@@ -214,16 +214,16 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
   }
 
   public void unset_executed() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXECUTED_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXECUTED_ISSET_ID);
   }
 
   /** Returns true if field executed is set (has been assigned a value) and false otherwise */
   public boolean is_set_executed() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXECUTED_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __EXECUTED_ISSET_ID);
   }
 
   public void set_executed_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXECUTED_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __EXECUTED_ISSET_ID, value);
   }
 
   public double get_capacity() {
@@ -236,16 +236,16 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
   }
 
   public void unset_capacity() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CAPACITY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __CAPACITY_ISSET_ID);
   }
 
   /** Returns true if field capacity is set (has been assigned a value) and false otherwise */
   public boolean is_set_capacity() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CAPACITY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __CAPACITY_ISSET_ID);
   }
 
   public void set_capacity_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CAPACITY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __CAPACITY_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -382,19 +382,19 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
 
     hashCode = hashCode * 8191 + ((is_set_execute_latency_ms()) ? 131071 : 524287);
     if (is_set_execute_latency_ms())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(execute_latency_ms);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(execute_latency_ms);
 
     hashCode = hashCode * 8191 + ((is_set_process_latency_ms()) ? 131071 : 524287);
     if (is_set_process_latency_ms())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(process_latency_ms);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(process_latency_ms);
 
     hashCode = hashCode * 8191 + ((is_set_executed()) ? 131071 : 524287);
     if (is_set_executed())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(executed);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(executed);
 
     hashCode = hashCode * 8191 + ((is_set_capacity()) ? 131071 : 524287);
     if (is_set_capacity())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(capacity);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(capacity);
 
     return hashCode;
   }
@@ -412,7 +412,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
       return lastComparison;
     }
     if (is_set_execute_latency_ms()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execute_latency_ms, other.execute_latency_ms);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.execute_latency_ms, other.execute_latency_ms);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -422,7 +422,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
       return lastComparison;
     }
     if (is_set_process_latency_ms()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.process_latency_ms, other.process_latency_ms);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.process_latency_ms, other.process_latency_ms);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -432,7 +432,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
       return lastComparison;
     }
     if (is_set_executed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executed, other.executed);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executed, other.executed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -442,7 +442,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
       return lastComparison;
     }
     if (is_set_capacity()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.capacity, other.capacity);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.capacity, other.capacity);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -454,11 +454,11 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
     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);
   }
 
@@ -494,15 +494,15 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -511,64 +511,64 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
     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 BoltAggregateStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BoltAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BoltAggregateStatsStandardScheme getScheme() {
       return new BoltAggregateStatsStandardScheme();
     }
   }
 
-  private static class BoltAggregateStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<BoltAggregateStats> {
+  private static class BoltAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<BoltAggregateStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, BoltAggregateStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, BoltAggregateStats 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: // EXECUTE_LATENCY_MS
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.execute_latency_ms = iprot.readDouble();
               struct.set_execute_latency_ms_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: // PROCESS_LATENCY_MS
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.process_latency_ms = iprot.readDouble();
               struct.set_process_latency_ms_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: // EXECUTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.executed = iprot.readI64();
               struct.set_executed_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: // CAPACITY
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.capacity = iprot.readDouble();
               struct.set_capacity_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();
       }
@@ -576,7 +576,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, BoltAggregateStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, BoltAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -606,17 +606,17 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
 
   }
 
-  private static class BoltAggregateStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BoltAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BoltAggregateStatsTupleScheme getScheme() {
       return new BoltAggregateStatsTupleScheme();
     }
   }
 
-  private static class BoltAggregateStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<BoltAggregateStats> {
+  private static class BoltAggregateStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<BoltAggregateStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, BoltAggregateStats 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, BoltAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_execute_latency_ms()) {
         optionals.set(0);
@@ -646,8 +646,8 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, BoltAggregateStats 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, BoltAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.execute_latency_ms = iprot.readDouble();
@@ -668,8 +668,8 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
     }
   }
 
-  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/BoltStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java b/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java
index dd84c66..f12e637 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/BoltStats.java
@@ -25,17 +25,17 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltStats");
+public class BoltStats implements org.apache.storm.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("BoltStats");
 
-  private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
-  private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField PROCESS_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("process_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)3);
-  private static final org.apache.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift.protocol.TField("executed", org.apache.thrift.protocol.TType.MAP, (short)4);
-  private static final org.apache.thrift.protocol.TField EXECUTE_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("execute_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("acked", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("failed", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField PROCESS_MS_AVG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("process_ms_avg", org.apache.storm.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("executed", org.apache.storm.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTE_MS_AVG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("execute_ms_avg", org.apache.storm.thrift.protocol.TType.MAP, (short)5);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BoltStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BoltStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BoltStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BoltStatsTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>> acked; // required
   private java.util.Map<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>> failed; // required
@@ -44,7 +44,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
   private java.util.Map<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>> execute_ms_avg; // 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 {
     ACKED((short)1, "acked"),
     FAILED((short)2, "failed"),
     PROCESS_MS_AVG((short)3, "process_ms_avg"),
@@ -114,41 +114,41 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
   }
 
   // isset id assignments
-  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.ACKED, new org.apache.thrift.meta_data.FieldMetaData("acked", 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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.FAILED, new org.apache.thrift.meta_data.FieldMetaData("failed", 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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.PROCESS_MS_AVG, new org.apache.thrift.meta_data.FieldMetaData("process_ms_avg", 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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))));
-    tmpMap.put(_Fields.EXECUTED, new org.apache.thrift.meta_data.FieldMetaData("executed", 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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))));
-    tmpMap.put(_Fields.EXECUTE_MS_AVG, new org.apache.thrift.meta_data.FieldMetaData("execute_ms_avg", 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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))));
+    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.ACKED, new org.apache.storm.thrift.meta_data.FieldMetaData("acked", 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.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+                new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.FAILED, new org.apache.storm.thrift.meta_data.FieldMetaData("failed", 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.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+                new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.PROCESS_MS_AVG, new org.apache.storm.thrift.meta_data.FieldMetaData("process_ms_avg", 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.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+                new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)))));
+    tmpMap.put(_Fields.EXECUTED, new org.apache.storm.thrift.meta_data.FieldMetaData("executed", 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.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+                new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)))));
+    tmpMap.put(_Fields.EXECUTE_MS_AVG, new org.apache.storm.thrift.meta_data.FieldMetaData("execute_ms_avg", 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.MapMetaData(org.apache.storm.thrift.protocol.TType.MAP, 
+                new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, GlobalStreamId.class), 
+                new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BoltStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BoltStats.class, metaDataMap);
   }
 
   public BoltStats() {
@@ -678,7 +678,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       return lastComparison;
     }
     if (is_set_acked()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, other.acked);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.acked, other.acked);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -688,7 +688,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       return lastComparison;
     }
     if (is_set_failed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, other.failed);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.failed, other.failed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -698,7 +698,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       return lastComparison;
     }
     if (is_set_process_ms_avg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.process_ms_avg, other.process_ms_avg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.process_ms_avg, other.process_ms_avg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -708,7 +708,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       return lastComparison;
     }
     if (is_set_executed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executed, other.executed);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.executed, other.executed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -718,7 +718,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       return lastComparison;
     }
     if (is_set_execute_ms_avg()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execute_ms_avg, other.execute_ms_avg);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.execute_ms_avg, other.execute_ms_avg);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -730,11 +730,11 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
     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);
   }
 
@@ -786,26 +786,26 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
     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_acked()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'acked' is unset! Struct:" + toString());
     }
 
     if (!is_set_failed()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'failed' is unset! Struct:" + toString());
     }
 
     if (!is_set_process_ms_avg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'process_ms_avg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'process_ms_avg' is unset! Struct:" + toString());
     }
 
     if (!is_set_executed()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'executed' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'executed' is unset! Struct:" + toString());
     }
 
     if (!is_set_execute_ms_avg()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'execute_ms_avg' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'execute_ms_avg' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -813,42 +813,42 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
 
   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 BoltStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BoltStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BoltStatsStandardScheme getScheme() {
       return new BoltStatsStandardScheme();
     }
   }
 
-  private static class BoltStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<BoltStats> {
+  private static class BoltStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<BoltStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, BoltStats 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: // ACKED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map160 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map160 = iprot.readMapBegin();
                 struct.acked = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map160.size);
                 java.lang.String _key161;
                 java.util.Map<GlobalStreamId,java.lang.Long> _val162;
@@ -856,7 +856,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
                 {
                   _key161 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map164 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map164 = iprot.readMapBegin();
                     _val162 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map164.size);
                     GlobalStreamId _key165;
                     long _val166;
@@ -875,13 +875,13 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
               }
               struct.set_acked_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: // FAILED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map168 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map168 = iprot.readMapBegin();
                 struct.failed = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map168.size);
                 java.lang.String _key169;
                 java.util.Map<GlobalStreamId,java.lang.Long> _val170;
@@ -889,7 +889,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
                 {
                   _key169 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map172 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map172 = iprot.readMapBegin();
                     _val170 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map172.size);
                     GlobalStreamId _key173;
                     long _val174;
@@ -908,13 +908,13 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
               }
               struct.set_failed_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: // PROCESS_MS_AVG
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map176 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map176 = iprot.readMapBegin();
                 struct.process_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>>(2*_map176.size);
                 java.lang.String _key177;
                 java.util.Map<GlobalStreamId,java.lang.Double> _val178;
@@ -922,7 +922,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
                 {
                   _key177 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map180 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map180 = iprot.readMapBegin();
                     _val178 = new java.util.HashMap<GlobalStreamId,java.lang.Double>(2*_map180.size);
                     GlobalStreamId _key181;
                     double _val182;
@@ -941,13 +941,13 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
               }
               struct.set_process_ms_avg_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: // EXECUTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map184 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map184 = iprot.readMapBegin();
                 struct.executed = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map184.size);
                 java.lang.String _key185;
                 java.util.Map<GlobalStreamId,java.lang.Long> _val186;
@@ -955,7 +955,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
                 {
                   _key185 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map188 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map188 = iprot.readMapBegin();
                     _val186 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map188.size);
                     GlobalStreamId _key189;
                     long _val190;
@@ -974,13 +974,13 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
               }
               struct.set_executed_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: // EXECUTE_MS_AVG
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map192 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map192 = iprot.readMapBegin();
                 struct.execute_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>>(2*_map192.size);
                 java.lang.String _key193;
                 java.util.Map<GlobalStreamId,java.lang.Double> _val194;
@@ -988,7 +988,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
                 {
                   _key193 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TMap _map196 = iprot.readMapBegin();
+                    org.apache.storm.thrift.protocol.TMap _map196 = iprot.readMapBegin();
                     _val194 = new java.util.HashMap<GlobalStreamId,java.lang.Double>(2*_map196.size);
                     GlobalStreamId _key197;
                     double _val198;
@@ -1007,11 +1007,11 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
               }
               struct.set_execute_ms_avg_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();
       }
@@ -1019,19 +1019,19 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, BoltStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, BoltStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.acked != null) {
         oprot.writeFieldBegin(ACKED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.acked.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<GlobalStreamId,java.lang.Long>> _iter200 : struct.acked.entrySet())
           {
             oprot.writeString(_iter200.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter200.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, _iter200.getValue().size()));
               for (java.util.Map.Entry<GlobalStreamId, java.lang.Long> _iter201 : _iter200.getValue().entrySet())
               {
                 _iter201.getKey().write(oprot);
@@ -1047,12 +1047,12 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       if (struct.failed != null) {
         oprot.writeFieldBegin(FAILED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.failed.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<GlobalStreamId,java.lang.Long>> _iter202 : struct.failed.entrySet())
           {
             oprot.writeString(_iter202.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter202.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, _iter202.getValue().size()));
               for (java.util.Map.Entry<GlobalStreamId, java.lang.Long> _iter203 : _iter202.getValue().entrySet())
               {
                 _iter203.getKey().write(oprot);
@@ -1068,12 +1068,12 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       if (struct.process_ms_avg != null) {
         oprot.writeFieldBegin(PROCESS_MS_AVG_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.process_ms_avg.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.process_ms_avg.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<GlobalStreamId,java.lang.Double>> _iter204 : struct.process_ms_avg.entrySet())
           {
             oprot.writeString(_iter204.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter204.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE, _iter204.getValue().size()));
               for (java.util.Map.Entry<GlobalStreamId, java.lang.Double> _iter205 : _iter204.getValue().entrySet())
               {
                 _iter205.getKey().write(oprot);
@@ -1089,12 +1089,12 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       if (struct.executed != null) {
         oprot.writeFieldBegin(EXECUTED_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.executed.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.executed.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<GlobalStreamId,java.lang.Long>> _iter206 : struct.executed.entrySet())
           {
             oprot.writeString(_iter206.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter206.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, _iter206.getValue().size()));
               for (java.util.Map.Entry<GlobalStreamId, java.lang.Long> _iter207 : _iter206.getValue().entrySet())
               {
                 _iter207.getKey().write(oprot);
@@ -1110,12 +1110,12 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       if (struct.execute_ms_avg != null) {
         oprot.writeFieldBegin(EXECUTE_MS_AVG_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.execute_ms_avg.size()));
+          oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, struct.execute_ms_avg.size()));
           for (java.util.Map.Entry<java.lang.String, java.util.Map<GlobalStreamId,java.lang.Double>> _iter208 : struct.execute_ms_avg.entrySet())
           {
             oprot.writeString(_iter208.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter208.getValue().size()));
+              oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE, _iter208.getValue().size()));
               for (java.util.Map.Entry<GlobalStreamId, java.lang.Double> _iter209 : _iter208.getValue().entrySet())
               {
                 _iter209.getKey().write(oprot);
@@ -1134,17 +1134,17 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
 
   }
 
-  private static class BoltStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class BoltStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public BoltStatsTupleScheme getScheme() {
       return new BoltStatsTupleScheme();
     }
   }
 
-  private static class BoltStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<BoltStats> {
+  private static class BoltStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<BoltStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, BoltStats 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, BoltStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.acked.size());
         for (java.util.Map.Entry<java.lang.String, java.util.Map<GlobalStreamId,java.lang.Long>> _iter210 : struct.acked.entrySet())
@@ -1223,10 +1223,10 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, BoltStats 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, BoltStats 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 _map220 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map220 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.acked = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map220.size);
         java.lang.String _key221;
         java.util.Map<GlobalStreamId,java.lang.Long> _val222;
@@ -1234,7 +1234,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
         {
           _key221 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map224 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map224 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val222 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map224.size);
             GlobalStreamId _key225;
             long _val226;
@@ -1251,7 +1251,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       }
       struct.set_acked_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map228 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map228 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.failed = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map228.size);
         java.lang.String _key229;
         java.util.Map<GlobalStreamId,java.lang.Long> _val230;
@@ -1259,7 +1259,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
         {
           _key229 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map232 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map232 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val230 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map232.size);
             GlobalStreamId _key233;
             long _val234;
@@ -1276,7 +1276,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       }
       struct.set_failed_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map236 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map236 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.process_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>>(2*_map236.size);
         java.lang.String _key237;
         java.util.Map<GlobalStreamId,java.lang.Double> _val238;
@@ -1284,7 +1284,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
         {
           _key237 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map240 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map240 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
             _val238 = new java.util.HashMap<GlobalStreamId,java.lang.Double>(2*_map240.size);
             GlobalStreamId _key241;
             double _val242;
@@ -1301,7 +1301,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       }
       struct.set_process_ms_avg_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map244 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map244 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.executed = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Long>>(2*_map244.size);
         java.lang.String _key245;
         java.util.Map<GlobalStreamId,java.lang.Long> _val246;
@@ -1309,7 +1309,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
         {
           _key245 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map248 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map248 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
             _val246 = new java.util.HashMap<GlobalStreamId,java.lang.Long>(2*_map248.size);
             GlobalStreamId _key249;
             long _val250;
@@ -1326,7 +1326,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
       }
       struct.set_executed_isSet(true);
       {
-        org.apache.thrift.protocol.TMap _map252 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        org.apache.storm.thrift.protocol.TMap _map252 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.MAP, iprot.readI32());
         struct.execute_ms_avg = new java.util.HashMap<java.lang.String,java.util.Map<GlobalStreamId,java.lang.Double>>(2*_map252.size);
         java.lang.String _key253;
         java.util.Map<GlobalStreamId,java.lang.Double> _val254;
@@ -1334,7 +1334,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
         {
           _key253 = iprot.readString();
           {
-            org.apache.thrift.protocol.TMap _map256 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+            org.apache.storm.thrift.protocol.TMap _map256 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRUCT, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
             _val254 = new java.util.HashMap<GlobalStreamId,java.lang.Double>(2*_map256.size);
             GlobalStreamId _key257;
             double _val258;
@@ -1353,8 +1353,8 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java b/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
index f41d069..7298624 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.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 SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMeta, SettableBlobMeta._Fields>, java.io.Serializable, Cloneable, Comparable<SettableBlobMeta> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SettableBlobMeta");
+public class SettableBlobMeta implements org.apache.storm.thrift.TBase<SettableBlobMeta, SettableBlobMeta._Fields>, java.io.Serializable, Cloneable, Comparable<SettableBlobMeta> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SettableBlobMeta");
 
-  private static final org.apache.thrift.protocol.TField ACL_FIELD_DESC = new org.apache.thrift.protocol.TField("acl", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField REPLICATION_FACTOR_FIELD_DESC = new org.apache.thrift.protocol.TField("replication_factor", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField ACL_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("acl", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField REPLICATION_FACTOR_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("replication_factor", org.apache.storm.thrift.protocol.TType.I32, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SettableBlobMetaStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SettableBlobMetaTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SettableBlobMetaStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SettableBlobMetaTupleSchemeFactory();
 
   private java.util.List<AccessControl> acl; // required
   private int replication_factor; // 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 {
     ACL((short)1, "acl"),
     REPLICATION_FACTOR((short)2, "replication_factor");
 
@@ -102,16 +102,16 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
   private static final int __REPLICATION_FACTOR_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.REPLICATION_FACTOR};
-  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.ACL, new org.apache.thrift.meta_data.FieldMetaData("acl", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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, AccessControl.class))));
-    tmpMap.put(_Fields.REPLICATION_FACTOR, new org.apache.thrift.meta_data.FieldMetaData("replication_factor", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.ACL, new org.apache.storm.thrift.meta_data.FieldMetaData("acl", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, AccessControl.class))));
+    tmpMap.put(_Fields.REPLICATION_FACTOR, new org.apache.storm.thrift.meta_data.FieldMetaData("replication_factor", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SettableBlobMeta.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SettableBlobMeta.class, metaDataMap);
   }
 
   public SettableBlobMeta() {
@@ -198,16 +198,16 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
   }
 
   public void unset_replication_factor() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID);
   }
 
   /** Returns true if field replication_factor is set (has been assigned a value) and false otherwise */
   public boolean is_set_replication_factor() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID);
   }
 
   public void set_replication_factor_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_FACTOR_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -322,7 +322,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
       return lastComparison;
     }
     if (is_set_acl()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acl, other.acl);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.acl, other.acl);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -332,7 +332,7 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
       return lastComparison;
     }
     if (is_set_replication_factor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_factor, other.replication_factor);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.replication_factor, other.replication_factor);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -344,11 +344,11 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
     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);
   }
 
@@ -374,10 +374,10 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
     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_acl()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'acl' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'acl' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -385,8 +385,8 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
 
   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);
     }
   }
@@ -395,34 +395,34 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
     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 SettableBlobMetaStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SettableBlobMetaStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SettableBlobMetaStandardScheme getScheme() {
       return new SettableBlobMetaStandardScheme();
     }
   }
 
-  private static class SettableBlobMetaStandardScheme extends org.apache.thrift.scheme.StandardScheme<SettableBlobMeta> {
+  private static class SettableBlobMetaStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SettableBlobMeta> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SettableBlobMeta struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SettableBlobMeta 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: // ACL
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list606 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list606 = iprot.readListBegin();
                 struct.acl = new java.util.ArrayList<AccessControl>(_list606.size);
                 AccessControl _elem607;
                 for (int _i608 = 0; _i608 < _list606.size; ++_i608)
@@ -435,19 +435,19 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
               }
               struct.set_acl_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: // REPLICATION_FACTOR
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.replication_factor = iprot.readI32();
               struct.set_replication_factor_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();
       }
@@ -455,14 +455,14 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SettableBlobMeta struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SettableBlobMeta struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.acl != null) {
         oprot.writeFieldBegin(ACL_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.acl.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.acl.size()));
           for (AccessControl _iter609 : struct.acl)
           {
             _iter609.write(oprot);
@@ -482,17 +482,17 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
 
   }
 
-  private static class SettableBlobMetaTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SettableBlobMetaTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SettableBlobMetaTupleScheme getScheme() {
       return new SettableBlobMetaTupleScheme();
     }
   }
 
-  private static class SettableBlobMetaTupleScheme extends org.apache.thrift.scheme.TupleScheme<SettableBlobMeta> {
+  private static class SettableBlobMetaTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SettableBlobMeta> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta 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, SettableBlobMeta struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.acl.size());
         for (AccessControl _iter610 : struct.acl)
@@ -511,10 +511,10 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta 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, SettableBlobMeta 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 _list611 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        org.apache.storm.thrift.protocol.TList _list611 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.acl = new java.util.ArrayList<AccessControl>(_list611.size);
         AccessControl _elem612;
         for (int _i613 = 0; _i613 < _list611.size; ++_i613)
@@ -533,8 +533,8 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
     }
   }
 
-  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/SharedMemory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SharedMemory.java b/storm-client/src/jvm/org/apache/storm/generated/SharedMemory.java
index 5efa346..70696a5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SharedMemory.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SharedMemory.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, SharedMemory._Fields>, java.io.Serializable, Cloneable, Comparable<SharedMemory> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SharedMemory");
+public class SharedMemory implements org.apache.storm.thrift.TBase<SharedMemory, SharedMemory._Fields>, java.io.Serializable, Cloneable, Comparable<SharedMemory> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SharedMemory");
 
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField ON_HEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("on_heap", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
-  private static final org.apache.thrift.protocol.TField OFF_HEAP_WORKER_FIELD_DESC = new org.apache.thrift.protocol.TField("off_heap_worker", org.apache.thrift.protocol.TType.DOUBLE, (short)3);
-  private static final org.apache.thrift.protocol.TField OFF_HEAP_NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("off_heap_node", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField ON_HEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("on_heap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField OFF_HEAP_WORKER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("off_heap_worker", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField OFF_HEAP_NODE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("off_heap_node", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SharedMemoryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SharedMemoryTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SharedMemoryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SharedMemoryTupleSchemeFactory();
 
   private java.lang.String name; // required
   private double on_heap; // optional
@@ -42,7 +42,7 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
   private double off_heap_node; // 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 {
     NAME((short)1, "name"),
     ON_HEAP((short)2, "on_heap"),
     OFF_HEAP_WORKER((short)3, "off_heap_worker"),
@@ -114,19 +114,19 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
   private static final int __OFF_HEAP_NODE_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.ON_HEAP,_Fields.OFF_HEAP_WORKER,_Fields.OFF_HEAP_NODE};
-  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.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ON_HEAP, new org.apache.thrift.meta_data.FieldMetaData("on_heap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.OFF_HEAP_WORKER, new org.apache.thrift.meta_data.FieldMetaData("off_heap_worker", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.OFF_HEAP_NODE, new org.apache.thrift.meta_data.FieldMetaData("off_heap_node", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ON_HEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("on_heap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.OFF_HEAP_WORKER, new org.apache.storm.thrift.meta_data.FieldMetaData("off_heap_worker", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.OFF_HEAP_NODE, new org.apache.storm.thrift.meta_data.FieldMetaData("off_heap_node", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SharedMemory.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SharedMemory.class, metaDataMap);
   }
 
   public SharedMemory() {
@@ -200,16 +200,16 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
   }
 
   public void unset_on_heap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ON_HEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ON_HEAP_ISSET_ID);
   }
 
   /** Returns true if field on_heap is set (has been assigned a value) and false otherwise */
   public boolean is_set_on_heap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ON_HEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ON_HEAP_ISSET_ID);
   }
 
   public void set_on_heap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ON_HEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ON_HEAP_ISSET_ID, value);
   }
 
   public double get_off_heap_worker() {
@@ -222,16 +222,16 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
   }
 
   public void unset_off_heap_worker() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OFF_HEAP_WORKER_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __OFF_HEAP_WORKER_ISSET_ID);
   }
 
   /** Returns true if field off_heap_worker is set (has been assigned a value) and false otherwise */
   public boolean is_set_off_heap_worker() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OFF_HEAP_WORKER_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __OFF_HEAP_WORKER_ISSET_ID);
   }
 
   public void set_off_heap_worker_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OFF_HEAP_WORKER_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __OFF_HEAP_WORKER_ISSET_ID, value);
   }
 
   public double get_off_heap_node() {
@@ -244,16 +244,16 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
   }
 
   public void unset_off_heap_node() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OFF_HEAP_NODE_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __OFF_HEAP_NODE_ISSET_ID);
   }
 
   /** Returns true if field off_heap_node is set (has been assigned a value) and false otherwise */
   public boolean is_set_off_heap_node() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OFF_HEAP_NODE_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __OFF_HEAP_NODE_ISSET_ID);
   }
 
   public void set_off_heap_node_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OFF_HEAP_NODE_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __OFF_HEAP_NODE_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -394,15 +394,15 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
 
     hashCode = hashCode * 8191 + ((is_set_on_heap()) ? 131071 : 524287);
     if (is_set_on_heap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(on_heap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(on_heap);
 
     hashCode = hashCode * 8191 + ((is_set_off_heap_worker()) ? 131071 : 524287);
     if (is_set_off_heap_worker())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(off_heap_worker);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(off_heap_worker);
 
     hashCode = hashCode * 8191 + ((is_set_off_heap_node()) ? 131071 : 524287);
     if (is_set_off_heap_node())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(off_heap_node);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(off_heap_node);
 
     return hashCode;
   }
@@ -420,7 +420,7 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -430,7 +430,7 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
       return lastComparison;
     }
     if (is_set_on_heap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.on_heap, other.on_heap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.on_heap, other.on_heap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -440,7 +440,7 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
       return lastComparison;
     }
     if (is_set_off_heap_worker()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.off_heap_worker, other.off_heap_worker);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.off_heap_worker, other.off_heap_worker);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -450,7 +450,7 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
       return lastComparison;
     }
     if (is_set_off_heap_node()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.off_heap_node, other.off_heap_node);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.off_heap_node, other.off_heap_node);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -462,11 +462,11 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
     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);
   }
 
@@ -504,10 +504,10 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
     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_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -515,8 +515,8 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
 
   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);
     }
   }
@@ -525,64 +525,64 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
     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 SharedMemoryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SharedMemoryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SharedMemoryStandardScheme getScheme() {
       return new SharedMemoryStandardScheme();
     }
   }
 
-  private static class SharedMemoryStandardScheme extends org.apache.thrift.scheme.StandardScheme<SharedMemory> {
+  private static class SharedMemoryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SharedMemory> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SharedMemory struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SharedMemory 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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // ON_HEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.on_heap = iprot.readDouble();
               struct.set_on_heap_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: // OFF_HEAP_WORKER
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.off_heap_worker = iprot.readDouble();
               struct.set_off_heap_worker_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: // OFF_HEAP_NODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.off_heap_node = iprot.readDouble();
               struct.set_off_heap_node_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();
       }
@@ -590,7 +590,7 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SharedMemory struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SharedMemory struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -620,17 +620,17 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
 
   }
 
-  private static class SharedMemoryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SharedMemoryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SharedMemoryTupleScheme getScheme() {
       return new SharedMemoryTupleScheme();
     }
   }
 
-  private static class SharedMemoryTupleScheme extends org.apache.thrift.scheme.TupleScheme<SharedMemory> {
+  private static class SharedMemoryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SharedMemory> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SharedMemory 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, SharedMemory struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.name);
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_on_heap()) {
@@ -655,8 +655,8 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SharedMemory 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, SharedMemory struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.name = iprot.readString();
       struct.set_name_isSet(true);
       java.util.BitSet incoming = iprot.readBitSet(3);
@@ -675,8 +675,8 @@ public class SharedMemory implements org.apache.thrift.TBase<SharedMemory, Share
     }
   }
 
-  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/ShellComponent.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ShellComponent.java b/storm-client/src/jvm/org/apache/storm/generated/ShellComponent.java
index 1d9ac63..1b96095 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ShellComponent.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ShellComponent.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 ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable, Comparable<ShellComponent> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShellComponent");
+public class ShellComponent implements org.apache.storm.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable, Comparable<ShellComponent> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ShellComponent");
 
-  private static final org.apache.thrift.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("execution_command", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SCRIPT_FIELD_DESC = new org.apache.thrift.protocol.TField("script", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("execution_command", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SCRIPT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("script", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ShellComponentStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ShellComponentTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ShellComponentStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ShellComponentTupleSchemeFactory();
 
   private java.lang.String execution_command; // required
   private java.lang.String script; // 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 {
     EXECUTION_COMMAND((short)1, "execution_command"),
     SCRIPT((short)2, "script");
 
@@ -99,15 +99,15 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
   }
 
   // isset id assignments
-  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.EXECUTION_COMMAND, new org.apache.thrift.meta_data.FieldMetaData("execution_command", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SCRIPT, new org.apache.thrift.meta_data.FieldMetaData("script", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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.EXECUTION_COMMAND, new org.apache.storm.thrift.meta_data.FieldMetaData("execution_command", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.SCRIPT, new org.apache.storm.thrift.meta_data.FieldMetaData("script", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ShellComponent.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ShellComponent.class, metaDataMap);
   }
 
   public ShellComponent() {
@@ -302,7 +302,7 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
       return lastComparison;
     }
     if (is_set_execution_command()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execution_command, other.execution_command);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.execution_command, other.execution_command);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -312,7 +312,7 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
       return lastComparison;
     }
     if (is_set_script()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.script, other.script);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.script, other.script);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -324,11 +324,11 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
     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);
   }
 
@@ -356,63 +356,63 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 ShellComponentStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ShellComponentStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ShellComponentStandardScheme getScheme() {
       return new ShellComponentStandardScheme();
     }
   }
 
-  private static class ShellComponentStandardScheme extends org.apache.thrift.scheme.StandardScheme<ShellComponent> {
+  private static class ShellComponentStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ShellComponent> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ShellComponent struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ShellComponent 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: // EXECUTION_COMMAND
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.execution_command = iprot.readString();
               struct.set_execution_command_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: // SCRIPT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.script = iprot.readString();
               struct.set_script_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();
       }
@@ -420,7 +420,7 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ShellComponent struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ShellComponent struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -440,17 +440,17 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
 
   }
 
-  private static class ShellComponentTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ShellComponentTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ShellComponentTupleScheme getScheme() {
       return new ShellComponentTupleScheme();
     }
   }
 
-  private static class ShellComponentTupleScheme extends org.apache.thrift.scheme.TupleScheme<ShellComponent> {
+  private static class ShellComponentTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ShellComponent> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ShellComponent 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, ShellComponent struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_execution_command()) {
         optionals.set(0);
@@ -468,8 +468,8 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ShellComponent 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, ShellComponent struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.execution_command = iprot.readString();
@@ -482,8 +482,8 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
     }
   }
 
-  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/SpecificAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SpecificAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/SpecificAggregateStats.java
index 293004b..aa90abe 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SpecificAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SpecificAggregateStats.java
@@ -24,13 +24,13 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAggregateStats, SpecificAggregateStats._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpecificAggregateStats");
-  private static final org.apache.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField SPOUT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+public class SpecificAggregateStats extends org.apache.storm.thrift.TUnion<SpecificAggregateStats, SpecificAggregateStats._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SpecificAggregateStats");
+  private static final org.apache.storm.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bolt", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SPOUT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("spout", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
   /** 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 {
     BOLT((short)1, "bolt"),
     SPOUT((short)2, "spout");
 
@@ -90,15 +90,15 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
     }
   }
 
-  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.BOLT, new org.apache.thrift.meta_data.FieldMetaData("bolt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BoltAggregateStats.class)));
-    tmpMap.put(_Fields.SPOUT, new org.apache.thrift.meta_data.FieldMetaData("spout", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SpoutAggregateStats.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.BOLT, new org.apache.storm.thrift.meta_data.FieldMetaData("bolt", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, BoltAggregateStats.class)));
+    tmpMap.put(_Fields.SPOUT, new org.apache.storm.thrift.meta_data.FieldMetaData("spout", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SpoutAggregateStats.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpecificAggregateStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpecificAggregateStats.class, metaDataMap);
   }
 
   public SpecificAggregateStats() {
@@ -148,7 +148,7 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -159,7 +159,7 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
             bolt.read(iprot);
             return bolt;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case SPOUT:
@@ -169,20 +169,20 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
             spout.read(iprot);
             return spout;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case BOLT:
         BoltAggregateStats bolt = (BoltAggregateStats)value_;
@@ -198,7 +198,7 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
@@ -216,12 +216,12 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case BOLT:
         BoltAggregateStats bolt = (BoltAggregateStats)value_;
@@ -237,7 +237,7 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case BOLT:
         return BOLT_FIELD_DESC;
@@ -249,7 +249,7 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -315,9 +315,9 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
 
   @Override
   public int compareTo(SpecificAggregateStats other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -327,12 +327,12 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -341,8 +341,8 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
   }
   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);
     }
   }
@@ -350,8 +350,8 @@ public class SpecificAggregateStats extends org.apache.thrift.TUnion<SpecificAgg
 
   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);
     }
   }

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/SpoutAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SpoutAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/SpoutAggregateStats.java
index 796f6ad..eccf8c3 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SpoutAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SpoutAggregateStats.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggregateStats, SpoutAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutAggregateStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutAggregateStats");
+public class SpoutAggregateStats implements org.apache.storm.thrift.TBase<SpoutAggregateStats, SpoutAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutAggregateStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("SpoutAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField COMPLETE_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("complete_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField COMPLETE_LATENCY_MS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("complete_latency_ms", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SpoutAggregateStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SpoutAggregateStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SpoutAggregateStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SpoutAggregateStatsTupleSchemeFactory();
 
   private double complete_latency_ms; // 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 {
     COMPLETE_LATENCY_MS((short)1, "complete_latency_ms");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -97,13 +97,13 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
   private static final int __COMPLETE_LATENCY_MS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.COMPLETE_LATENCY_MS};
-  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.COMPLETE_LATENCY_MS, new org.apache.thrift.meta_data.FieldMetaData("complete_latency_ms", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.COMPLETE_LATENCY_MS, new org.apache.storm.thrift.meta_data.FieldMetaData("complete_latency_ms", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutAggregateStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SpoutAggregateStats.class, metaDataMap);
   }
 
   public SpoutAggregateStats() {
@@ -137,16 +137,16 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
   }
 
   public void unset_complete_latency_ms() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __COMPLETE_LATENCY_MS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __COMPLETE_LATENCY_MS_ISSET_ID);
   }
 
   /** Returns true if field complete_latency_ms is set (has been assigned a value) and false otherwise */
   public boolean is_set_complete_latency_ms() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __COMPLETE_LATENCY_MS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __COMPLETE_LATENCY_MS_ISSET_ID);
   }
 
   public void set_complete_latency_ms_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __COMPLETE_LATENCY_MS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __COMPLETE_LATENCY_MS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -217,7 +217,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
 
     hashCode = hashCode * 8191 + ((is_set_complete_latency_ms()) ? 131071 : 524287);
     if (is_set_complete_latency_ms())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(complete_latency_ms);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(complete_latency_ms);
 
     return hashCode;
   }
@@ -235,7 +235,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
       return lastComparison;
     }
     if (is_set_complete_latency_ms()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.complete_latency_ms, other.complete_latency_ms);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.complete_latency_ms, other.complete_latency_ms);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -247,11 +247,11 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
     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);
   }
 
@@ -269,15 +269,15 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -286,40 +286,40 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
     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 SpoutAggregateStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SpoutAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SpoutAggregateStatsStandardScheme getScheme() {
       return new SpoutAggregateStatsStandardScheme();
     }
   }
 
-  private static class SpoutAggregateStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<SpoutAggregateStats> {
+  private static class SpoutAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<SpoutAggregateStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutAggregateStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, SpoutAggregateStats 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: // COMPLETE_LATENCY_MS
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.complete_latency_ms = iprot.readDouble();
               struct.set_complete_latency_ms_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();
       }
@@ -327,7 +327,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutAggregateStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, SpoutAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -342,17 +342,17 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
 
   }
 
-  private static class SpoutAggregateStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class SpoutAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public SpoutAggregateStatsTupleScheme getScheme() {
       return new SpoutAggregateStatsTupleScheme();
     }
   }
 
-  private static class SpoutAggregateStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<SpoutAggregateStats> {
+  private static class SpoutAggregateStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<SpoutAggregateStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SpoutAggregateStats 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, SpoutAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_complete_latency_ms()) {
         optionals.set(0);
@@ -364,8 +364,8 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SpoutAggregateStats 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, SpoutAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.complete_latency_ms = iprot.readDouble();
@@ -374,8 +374,8 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
     }
   }
 
-  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();
   }
 }
 


[45/50] [abbrv] storm git commit: STORM-2882: Added back in jaxb-api

Posted by bo...@apache.org.
STORM-2882: Added back in jaxb-api


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

Branch: refs/heads/master
Commit: b588b2556b39e6249bcd25654115ecbf21e19e94
Parents: 492eff4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jun 5 10:53:24 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 storm-client/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b588b255/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 3fa4b4d..a13359d 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -68,6 +68,13 @@
             <version>${project.version}</version>
         </dependency>
 
+	<!-- JAXB on JDK8 and below this is a part of java,
+	     but JDK9+ it is not there by default. -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
         <!-- kryo -->
         <dependency>
             <groupId>com.esotericsoftware</groupId>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java
index 292f734..1d741bf 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, WorkerTokenInfo._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerTokenInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerTokenInfo");
+public class WorkerTokenInfo implements org.apache.storm.thrift.TBase<WorkerTokenInfo, WorkerTokenInfo._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerTokenInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerTokenInfo");
 
-  private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topologyId", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField SECRET_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("secretVersion", org.apache.thrift.protocol.TType.I64, (short)3);
-  private static final org.apache.thrift.protocol.TField EXPIRATION_TIME_MILLIS_FIELD_DESC = new org.apache.thrift.protocol.TField("expirationTimeMillis", org.apache.thrift.protocol.TType.I64, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("userName", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topologyId", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SECRET_VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("secretVersion", org.apache.storm.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField EXPIRATION_TIME_MILLIS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("expirationTimeMillis", org.apache.storm.thrift.protocol.TType.I64, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerTokenInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerTokenInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerTokenInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerTokenInfoTupleSchemeFactory();
 
   private java.lang.String userName; // required
   private java.lang.String topologyId; // required
@@ -42,7 +42,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
   private long expirationTimeMillis; // 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 {
     USER_NAME((short)1, "userName"),
     TOPOLOGY_ID((short)2, "topologyId"),
     SECRET_VERSION((short)3, "secretVersion"),
@@ -112,19 +112,19 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
   private static final int __SECRETVERSION_ISSET_ID = 0;
   private static final int __EXPIRATIONTIMEMILLIS_ISSET_ID = 1;
   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.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topologyId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SECRET_VERSION, new org.apache.thrift.meta_data.FieldMetaData("secretVersion", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.EXPIRATION_TIME_MILLIS, new org.apache.thrift.meta_data.FieldMetaData("expirationTimeMillis", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    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.USER_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("userName", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topologyId", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.SECRET_VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("secretVersion", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.EXPIRATION_TIME_MILLIS, new org.apache.storm.thrift.meta_data.FieldMetaData("expirationTimeMillis", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerTokenInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerTokenInfo.class, metaDataMap);
   }
 
   public WorkerTokenInfo() {
@@ -230,16 +230,16 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
   }
 
   public void unset_secretVersion() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SECRETVERSION_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __SECRETVERSION_ISSET_ID);
   }
 
   /** Returns true if field secretVersion is set (has been assigned a value) and false otherwise */
   public boolean is_set_secretVersion() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SECRETVERSION_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __SECRETVERSION_ISSET_ID);
   }
 
   public void set_secretVersion_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SECRETVERSION_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __SECRETVERSION_ISSET_ID, value);
   }
 
   public long get_expirationTimeMillis() {
@@ -252,16 +252,16 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
   }
 
   public void unset_expirationTimeMillis() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
   }
 
   /** Returns true if field expirationTimeMillis is set (has been assigned a value) and false otherwise */
   public boolean is_set_expirationTimeMillis() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID);
   }
 
   public void set_expirationTimeMillis_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -404,9 +404,9 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
     if (is_set_topologyId())
       hashCode = hashCode * 8191 + topologyId.hashCode();
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(secretVersion);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(secretVersion);
 
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(expirationTimeMillis);
+    hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(expirationTimeMillis);
 
     return hashCode;
   }
@@ -424,7 +424,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
       return lastComparison;
     }
     if (is_set_userName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, other.userName);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.userName, other.userName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -434,7 +434,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
       return lastComparison;
     }
     if (is_set_topologyId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topologyId, other.topologyId);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topologyId, other.topologyId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -444,7 +444,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
       return lastComparison;
     }
     if (is_set_secretVersion()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.secretVersion, other.secretVersion);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.secretVersion, other.secretVersion);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -454,7 +454,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
       return lastComparison;
     }
     if (is_set_expirationTimeMillis()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expirationTimeMillis, other.expirationTimeMillis);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.expirationTimeMillis, other.expirationTimeMillis);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -466,11 +466,11 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
     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);
   }
 
@@ -506,22 +506,22 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
     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_userName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
     }
 
     if (!is_set_topologyId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'topologyId' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'topologyId' is unset! Struct:" + toString());
     }
 
     if (!is_set_secretVersion()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'secretVersion' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'secretVersion' is unset! Struct:" + toString());
     }
 
     if (!is_set_expirationTimeMillis()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'expirationTimeMillis' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'expirationTimeMillis' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -529,8 +529,8 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
 
   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);
     }
   }
@@ -539,64 +539,64 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
     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 WorkerTokenInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerTokenInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerTokenInfoStandardScheme getScheme() {
       return new WorkerTokenInfoStandardScheme();
     }
   }
 
-  private static class WorkerTokenInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerTokenInfo> {
+  private static class WorkerTokenInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerTokenInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerTokenInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerTokenInfo 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: // USER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.userName = iprot.readString();
               struct.set_userName_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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topologyId = iprot.readString();
               struct.set_topologyId_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: // SECRET_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.secretVersion = iprot.readI64();
               struct.set_secretVersion_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: // EXPIRATION_TIME_MILLIS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I64) {
               struct.expirationTimeMillis = iprot.readI64();
               struct.set_expirationTimeMillis_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();
       }
@@ -604,7 +604,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerTokenInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerTokenInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -630,17 +630,17 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
 
   }
 
-  private static class WorkerTokenInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerTokenInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerTokenInfoTupleScheme getScheme() {
       return new WorkerTokenInfoTupleScheme();
     }
   }
 
-  private static class WorkerTokenInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerTokenInfo> {
+  private static class WorkerTokenInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerTokenInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerTokenInfo 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, WorkerTokenInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.userName);
       oprot.writeString(struct.topologyId);
       oprot.writeI64(struct.secretVersion);
@@ -648,8 +648,8 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerTokenInfo 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, WorkerTokenInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.userName = iprot.readString();
       struct.set_userName_isSet(true);
       struct.topologyId = iprot.readString();
@@ -661,8 +661,8 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo,
     }
   }
 
-  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/WorkerTokenServiceType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java
index 38ba3b6..36b5bfa 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum WorkerTokenServiceType implements org.apache.thrift.TEnum {
+public enum WorkerTokenServiceType implements org.apache.storm.thrift.TEnum {
   NIMBUS(0),
   DRPC(1),
   SUPERVISOR(2);

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
index 114975a..0e9ed4e 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
@@ -15,10 +15,10 @@ package org.apache.storm.security.auth;
 import java.io.IOException;
 import java.util.Map;
 import javax.security.auth.login.Configuration;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.TProcessor;
+import org.apache.storm.thrift.server.TServer;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
 
 /**
  * Interface for Thrift Transport plugin
@@ -52,7 +52,7 @@ public interface ITransportPlugin {
     public TTransport connect(TTransport transport, String serverHost, String asUser) throws IOException, TTransportException;
 
     /**
-     * @return The port this transport is using. This is not known until {@link #getServer(org.apache.thrift.TProcessor)} has been called.
+     * @return The port this transport is using. This is not known until {@link #getServer(org.apache.storm.thrift.TProcessor)} has been called.
      */
     public int getPort();
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
index 895478b..059ebda 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
@@ -24,18 +24,18 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import javax.security.auth.Subject;
 import javax.security.auth.login.Configuration;
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.server.THsHaServer;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TMemoryInputTransport;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.TProcessor;
+import org.apache.storm.thrift.protocol.TBinaryProtocol;
+import org.apache.storm.thrift.protocol.TProtocol;
+import org.apache.storm.thrift.server.THsHaServer;
+import org.apache.storm.thrift.server.TServer;
+import org.apache.storm.thrift.transport.TFramedTransport;
+import org.apache.storm.thrift.transport.TMemoryInputTransport;
+import org.apache.storm.thrift.transport.TNonblockingServerSocket;
+import org.apache.storm.thrift.transport.TSocket;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/TBackoffConnect.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/TBackoffConnect.java b/storm-client/src/jvm/org/apache/storm/security/auth/TBackoffConnect.java
index b826952..ad5e5a9 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/TBackoffConnect.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/TBackoffConnect.java
@@ -13,9 +13,9 @@
 package org.apache.storm.security.auth;
 
 import java.io.IOException;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.utils.StormBoundedExponentialBackoffRetry;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
index aa0312f..9ad5ba3 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
@@ -16,10 +16,10 @@ import java.util.Map;
 import javax.security.auth.login.Configuration;
 import org.apache.storm.Config;
 import org.apache.storm.utils.ObjectReader;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
+import org.apache.storm.thrift.protocol.TBinaryProtocol;
+import org.apache.storm.thrift.protocol.TProtocol;
+import org.apache.storm.thrift.transport.TSocket;
+import org.apache.storm.thrift.transport.TTransport;
 
 public class ThriftClient implements AutoCloseable {
     protected TProtocol _protocol;

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
index 1b3a50f..eaeb17a 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
@@ -15,9 +15,9 @@ package org.apache.storm.security.auth;
 import java.io.IOException;
 import java.util.Map;
 import javax.security.auth.login.Configuration;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.TProcessor;
+import org.apache.storm.thrift.server.TServer;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java
index 2ecd32f..54731ee 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java
@@ -23,11 +23,11 @@ import org.apache.storm.security.auth.sasl.SimpleSaslClientCallbackHandler;
 import org.apache.storm.security.auth.sasl.SimpleSaslServerCallbackHandler;
 import org.apache.storm.security.auth.workertoken.WorkerTokenAuthorizer;
 import org.apache.storm.security.auth.workertoken.WorkerTokenClientCallbackHandler;
-import org.apache.thrift.transport.TSaslClientTransport;
-import org.apache.thrift.transport.TSaslServerTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
+import org.apache.storm.thrift.transport.TSaslClientTransport;
+import org.apache.storm.thrift.transport.TSaslServerTransport;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index 382190e..2007e9a 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -36,11 +36,11 @@ import org.apache.storm.security.auth.workertoken.WorkerTokenAuthorizer;
 import org.apache.storm.security.auth.workertoken.WorkerTokenClientCallbackHandler;
 import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
 import org.apache.storm.shade.org.apache.zookeeper.server.auth.KerberosName;
-import org.apache.thrift.transport.TSaslClientTransport;
-import org.apache.thrift.transport.TSaslServerTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
+import org.apache.storm.thrift.transport.TSaslClientTransport;
+import org.apache.storm.thrift.transport.TSaslServerTransport;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/NoOpTTrasport.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/NoOpTTrasport.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/NoOpTTrasport.java
index b347e8d..3d61d1f 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/NoOpTTrasport.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/NoOpTTrasport.java
@@ -12,9 +12,9 @@
 
 package org.apache.storm.security.auth.kerberos;
 
-import org.apache.thrift.transport.TSaslServerTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TSaslServerTransport;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
 
 public class NoOpTTrasport extends TSaslServerTransport {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/plain/PlainSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/plain/PlainSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/plain/PlainSaslTransportPlugin.java
index 8cd9acf..de01dc0 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/plain/PlainSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/plain/PlainSaslTransportPlugin.java
@@ -19,11 +19,11 @@ import javax.security.auth.callback.CallbackHandler;
 import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.sasl.SaslTransportPlugin;
 import org.apache.storm.security.auth.sasl.SimpleSaslServerCallbackHandler;
-import org.apache.thrift.transport.TSaslClientTransport;
-import org.apache.thrift.transport.TSaslServerTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
+import org.apache.storm.thrift.transport.TSaslClientTransport;
+import org.apache.storm.thrift.transport.TSaslServerTransport;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java
index 6fc5425..d40ad6f 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java
@@ -28,19 +28,19 @@ import org.apache.storm.security.auth.ITransportPlugin;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.security.auth.kerberos.NoOpTTrasport;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.TProcessor;
+import org.apache.storm.thrift.protocol.TBinaryProtocol;
+import org.apache.storm.thrift.protocol.TProtocol;
+import org.apache.storm.thrift.server.TServer;
+import org.apache.storm.thrift.server.TThreadPoolServer;
+import org.apache.storm.thrift.transport.TSaslServerTransport;
+import org.apache.storm.thrift.transport.TServerSocket;
+import org.apache.storm.thrift.transport.TSocket;
+import org.apache.storm.thrift.transport.TTransport;
+import org.apache.storm.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportFactory;
 import org.apache.storm.utils.ExtendedThreadPoolExecutor;
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.apache.thrift.transport.TSaslServerTransport;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
 
 /**
  * Base class for SASL authentication plugin.

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
index fe4a21f..f518628 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
@@ -19,11 +19,11 @@
 package org.apache.storm.serialization;
 
 import java.util.Map;
+import org.apache.storm.thrift.TBase;
+import org.apache.storm.thrift.TDeserializer;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.TSerializer;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
 
 /**
  * Note, this assumes it's deserializing a gzip byte stream, and will err if it encounters any other serialization.

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
index fb7f11e..a4863e3 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
@@ -13,10 +13,10 @@
 package org.apache.storm.serialization;
 
 import java.util.Map;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
+import org.apache.storm.thrift.TBase;
+import org.apache.storm.thrift.TDeserializer;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.TSerializer;
 
 public class ThriftSerializationDelegate implements SerializationDelegate {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java b/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
index 2fb9da5..2af7498 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
@@ -23,6 +23,8 @@ import org.apache.storm.generated.DistributedRPCInvocations;
 import org.apache.storm.shade.org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.storm.shade.org.json.simple.JSONValue;
 import org.apache.storm.shade.org.json.simple.parser.ParseException;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.trident.drpc.ReturnResultsReducer.ReturnResultsState;
 import org.apache.storm.trident.operation.MultiReducer;
 import org.apache.storm.trident.operation.TridentCollector;
@@ -30,9 +32,6 @@ import org.apache.storm.trident.operation.TridentMultiReducerContext;
 import org.apache.storm.trident.tuple.TridentTuple;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ServiceRegistry;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
-
 
 public class ReturnResultsReducer implements MultiReducer<ReturnResultsState> {
     boolean local;

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/trident/util/TridentUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/util/TridentUtils.java b/storm-client/src/jvm/org/apache/storm/trident/util/TridentUtils.java
index a3722bb..c290375 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/util/TridentUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/util/TridentUtils.java
@@ -20,11 +20,11 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.storm.generated.StreamInfo;
 import org.apache.storm.shade.org.jgrapht.DirectedGraph;
+import org.apache.storm.thrift.TBase;
 import org.apache.storm.topology.IComponent;
 import org.apache.storm.topology.OutputFieldsGetter;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TBase;
 
 public class TridentUtils {
     public static Fields fieldsUnion(Fields... fields) {

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
index 9b2eb94..d949f93 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
@@ -24,8 +24,8 @@ import org.apache.storm.generated.DRPCExecutionException;
 import org.apache.storm.generated.DistributedRPC;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/LocalState.java b/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
index ccce909..b2ca316 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/LocalState.java
@@ -29,9 +29,9 @@ import org.apache.storm.generated.LocalAssignment;
 import org.apache.storm.generated.LocalStateData;
 import org.apache.storm.generated.ThriftSerializedObject;
 import org.apache.storm.shade.org.apache.commons.io.FileUtils;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TSerializer;
+import org.apache.storm.thrift.TBase;
+import org.apache.storm.thrift.TDeserializer;
+import org.apache.storm.thrift.TSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
index 876f25f..da8bcf5 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -24,7 +24,7 @@ import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.shade.com.google.common.collect.Lists;
 import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/utils/SupervisorClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/SupervisorClient.java b/storm-client/src/jvm/org/apache/storm/utils/SupervisorClient.java
index e03350d..2364777 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/SupervisorClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/SupervisorClient.java
@@ -17,7 +17,7 @@ import org.apache.storm.Config;
 import org.apache.storm.generated.Supervisor;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index c1126ca..e62a5be 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -96,10 +96,10 @@ import org.apache.storm.shade.org.json.simple.JSONValue;
 import org.apache.storm.shade.org.json.simple.parser.ParseException;
 import org.apache.storm.shade.org.yaml.snakeyaml.Yaml;
 import org.apache.storm.shade.org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
+import org.apache.storm.thrift.TBase;
+import org.apache.storm.thrift.TDeserializer;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.TSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
index 330f17c..bdb792c 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
@@ -14,9 +14,9 @@ package org.apache.storm.security.auth;
 
 import java.util.Map;
 import org.apache.storm.Config;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.utils.ThrowableNestedCauseMatcher;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.transport.TTransportException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
index 776cc15..7ef3050 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -26,7 +26,7 @@ import org.apache.storm.Config;
 import org.apache.storm.shade.com.google.common.collect.ImmutableList;
 import org.apache.storm.shade.com.google.common.collect.ImmutableMap;
 import org.apache.storm.shade.com.google.common.collect.ImmutableSet;
-import org.apache.thrift.transport.TTransportException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-clojure/src/clj/org/apache/storm/thrift.clj
----------------------------------------------------------------------
diff --git a/storm-clojure/src/clj/org/apache/storm/thrift.clj b/storm-clojure/src/clj/org/apache/storm/thrift.clj
index 6db29bd..8470505 100644
--- a/storm-clojure/src/clj/org/apache/storm/thrift.clj
+++ b/storm-clojure/src/clj/org/apache/storm/thrift.clj
@@ -26,7 +26,7 @@
   (:import [org.apache.storm.grouping CustomStreamGrouping])
   (:import [org.apache.storm.topology TopologyBuilder])
   (:import [org.apache.storm.clojure RichShellBolt RichShellSpout])
-  (:import [org.apache.thrift.transport TTransport]
+  (:import [org.apache.storm.thrift.transport TTransport]
            (org.json.simple JSONValue))
   (:use [org.apache.storm util config log]))
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/ILocalClusterTrackedTopologyAware.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/ILocalClusterTrackedTopologyAware.java b/storm-server/src/main/java/org/apache/storm/ILocalClusterTrackedTopologyAware.java
index b279a8d..4927da4 100644
--- a/storm-server/src/main/java/org/apache/storm/ILocalClusterTrackedTopologyAware.java
+++ b/storm-server/src/main/java/org/apache/storm/ILocalClusterTrackedTopologyAware.java
@@ -21,7 +21,7 @@ package org.apache.storm;
 import java.util.Map;
 import org.apache.storm.generated.SubmitOptions;
 import org.apache.storm.testing.TrackedTopology;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
 
 /**
  * This is here mostly for backwards compatibility. Please see {@link org.apache.storm.LocalCluster} for more details on testing a Storm

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/LocalCluster.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/LocalCluster.java b/storm-server/src/main/java/org/apache/storm/LocalCluster.java
index 634ca35..81d8f2e 100644
--- a/storm-server/src/main/java/org/apache/storm/LocalCluster.java
+++ b/storm-server/src/main/java/org/apache/storm/LocalCluster.java
@@ -95,6 +95,7 @@ import org.apache.storm.testing.InProcessZookeeper;
 import org.apache.storm.testing.NonRichBoltTracker;
 import org.apache.storm.testing.TmpPath;
 import org.apache.storm.testing.TrackedTopology;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.DRPCClient;
 import org.apache.storm.utils.NimbusClient;
@@ -106,7 +107,6 @@ import org.apache.storm.utils.Time.SimulatedTime;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.WrappedAuthorizationException;
 import org.apache.storm.utils.WrappedKeyNotFoundException;
-import org.apache.thrift.TException;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;
@@ -946,7 +946,7 @@ public class LocalCluster implements ILocalClusterTrackedTopologyAware, Iface {
 
     }
 
-    public void processWorkerMetrics(WorkerMetrics metrics) throws org.apache.thrift.TException {
+    public void processWorkerMetrics(WorkerMetrics metrics) throws TException {
         getNimbus().processWorkerMetrics(metrics);
     }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/LocalDRPC.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/LocalDRPC.java b/storm-server/src/main/java/org/apache/storm/LocalDRPC.java
index ef257ed..327dd1b 100644
--- a/storm-server/src/main/java/org/apache/storm/LocalDRPC.java
+++ b/storm-server/src/main/java/org/apache/storm/LocalDRPC.java
@@ -24,9 +24,9 @@ import org.apache.storm.daemon.drpc.DRPCThrift;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.DRPCExecutionException;
 import org.apache.storm.generated.DRPCRequest;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.ServiceRegistry;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TException;
 
 /**
  * A Local way to test DRPC

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/Testing.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/Testing.java b/storm-server/src/main/java/org/apache/storm/Testing.java
index 5a8495b..6ac6370 100644
--- a/storm-server/src/main/java/org/apache/storm/Testing.java
+++ b/storm-server/src/main/java/org/apache/storm/Testing.java
@@ -43,6 +43,7 @@ import org.apache.storm.testing.MockedSources;
 import org.apache.storm.testing.TestJob;
 import org.apache.storm.testing.TrackedTopology;
 import org.apache.storm.testing.TupleCaptureBolt;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.tuple.Tuple;
 import org.apache.storm.tuple.TupleImpl;
@@ -51,7 +52,6 @@ import org.apache.storm.utils.RegisteredGlobalState;
 import org.apache.storm.utils.Time;
 import org.apache.storm.utils.Time.SimulatedTime;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
index 691956d..c61c0b5 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
@@ -31,11 +31,11 @@ import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.security.auth.NimbusPrincipal;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.utils.CuratorUtils;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.WrappedKeyNotFoundException;
 import org.apache.storm.utils.ZookeeperAuthInfo;
-import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index d53cc28..4fb2ff1 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -184,6 +184,7 @@ import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
 import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.stats.StatsUtil;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.BufferInputStream;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.LocalState;
@@ -207,7 +208,6 @@ import org.apache.storm.validation.ConfigValidation;
 import org.apache.storm.zookeeper.AclEnforcement;
 import org.apache.storm.zookeeper.ClientZookeeper;
 import org.apache.storm.zookeeper.Zookeeper;
-import org.apache.thrift.TException;
 import org.json.simple.JSONValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -4524,7 +4524,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
     }
 
     @Override
-    public void processWorkerMetrics(WorkerMetrics metrics) throws org.apache.thrift.TException {
+    public void processWorkerMetrics(WorkerMetrics metrics) throws TException {
         processWorkerMetricsCalls.mark();
 
         checkAuthorization(null, null, "processWorkerMetrics");

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
index 3f13864..f275835 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java
@@ -64,6 +64,8 @@ import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.security.auth.ThriftServer;
 import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.TProcessor;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.LocalState;
 import org.apache.storm.utils.ObjectReader;
@@ -73,8 +75,6 @@ import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.VersionInfo;
 import org.apache.storm.utils.WrappedAuthorizationException;
 import org.apache.storm.utils.WrappedNotAliveException;
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/ReportWorkerHeartbeats.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/ReportWorkerHeartbeats.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/ReportWorkerHeartbeats.java
index 6e4814c..75d54be 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/ReportWorkerHeartbeats.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/ReportWorkerHeartbeats.java
@@ -20,9 +20,9 @@ import org.apache.storm.daemon.supervisor.SupervisorUtils;
 import org.apache.storm.generated.LSWorkerHeartbeat;
 import org.apache.storm.generated.SupervisorWorkerHeartbeat;
 import org.apache.storm.generated.SupervisorWorkerHeartbeats;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.NimbusClient;
-import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java
index 639c9db..3960ce9 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java
@@ -19,11 +19,11 @@ import org.apache.storm.daemon.supervisor.ReadClusterState;
 import org.apache.storm.daemon.supervisor.Supervisor;
 import org.apache.storm.generated.Assignment;
 import org.apache.storm.generated.SupervisorAssignments;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.Time;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
index 98ad02e..a2b9079 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
@@ -51,13 +51,13 @@ import org.apache.storm.generated.LocalAssignment;
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.shade.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.NimbusLeaderNotFoundException;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ServerUtils;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.WrappedKeyNotFoundException;
-import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java b/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
index f3970b8..491017c 100644
--- a/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
+++ b/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
@@ -13,8 +13,8 @@ package org.apache.storm.metricstore;
 
 import java.util.Map;
 import org.apache.storm.generated.WorkerMetrics;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.NimbusClient;
-import org.apache.thrift.TException;
 
 /**
  * Implementation of WorkerMetricsProcessor that sends metric data to Nimbus for processing.

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java b/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
index 17d4d2f..89e732b 100644
--- a/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
+++ b/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
@@ -25,10 +25,10 @@ import org.apache.storm.Config;
 import org.apache.storm.generated.ExecutorInfo;
 import org.apache.storm.generated.SupervisorWorkerHeartbeat;
 import org.apache.storm.generated.SupervisorWorkerHeartbeats;
+import org.apache.storm.thrift.TException;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
 
 /**
  * Test for nimbus heartbeats max throughput, This is a client to collect the statistics.

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
index b2568cf..763e121 100644
--- a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
@@ -28,11 +28,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
@@ -45,7 +43,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
@@ -80,7 +77,7 @@ import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.scheduler.resource.ResourceUtils;
 import org.apache.storm.scheduler.resource.normalization.NormalizedResourceRequest;
 import org.apache.storm.security.auth.SingleUserPrincipal;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/test/java/org/apache/storm/TestRebalance.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/TestRebalance.java b/storm-server/src/test/java/org/apache/storm/TestRebalance.java
index 6f9f076..72460c1 100644
--- a/storm-server/src/test/java/org/apache/storm/TestRebalance.java
+++ b/storm-server/src/test/java/org/apache/storm/TestRebalance.java
@@ -22,11 +22,11 @@ import org.apache.storm.scheduler.resource.ResourceAwareScheduler;
 import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler;
 import org.apache.storm.scheduler.resource.strategies.priority.DefaultSchedulingPriorityStrategy;
 import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy;
+import org.apache.storm.thrift.TException;
 import org.apache.storm.topology.BoltDeclarer;
 import org.apache.storm.topology.SpoutDeclarer;
 import org.apache.storm.topology.TopologyBuilder;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.TException;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
index 7fbffe9..49a4641 100644
--- a/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
+++ b/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java
@@ -41,26 +41,17 @@ import org.apache.storm.security.auth.authorizer.SimpleWhitelistAuthorizer;
 import org.apache.storm.security.auth.digest.DigestSaslTransportPlugin;
 import org.apache.storm.security.auth.workertoken.WorkerTokenManager;
 import org.apache.storm.testing.InProcessZookeeper;
+import org.apache.storm.thrift.transport.TTransportException;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.Time;
 import org.apache.storm.utils.Utils;
-import org.apache.thrift.transport.TTransportException;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class AuthTest {
     //3 seconds in milliseconds

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
index 9ced5be..271c99f 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCResource.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Context;
 
 import org.apache.storm.daemon.drpc.DRPC;
 import org.apache.storm.metric.StormMetricsRegistry;
-import org.apache.thrift.TException;
+import org.apache.storm.thrift.TException;
 
 @Path("/drpc/")
 public class DRPCResource {


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/TopologyStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyStats.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyStats.java
index 5dea004..5343a97 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyStats.java
@@ -25,17 +25,17 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, TopologyStats._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyStats");
+public class TopologyStats implements org.apache.storm.thrift.TBase<TopologyStats, TopologyStats._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("TopologyStats");
 
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_emitted", org.apache.thrift.protocol.TType.MAP, (short)1);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_transferred", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_COMPLETE_LATENCIES_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_complete_latencies_ms", org.apache.thrift.protocol.TType.MAP, (short)3);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_acked", org.apache.thrift.protocol.TType.MAP, (short)4);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_failed", org.apache.thrift.protocol.TType.MAP, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField WINDOW_TO_EMITTED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("window_to_emitted", org.apache.storm.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField WINDOW_TO_TRANSFERRED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("window_to_transferred", org.apache.storm.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField WINDOW_TO_COMPLETE_LATENCIES_MS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("window_to_complete_latencies_ms", org.apache.storm.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField WINDOW_TO_ACKED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("window_to_acked", org.apache.storm.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField WINDOW_TO_FAILED_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("window_to_failed", org.apache.storm.thrift.protocol.TType.MAP, (short)5);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyStatsTupleSchemeFactory();
 
   private java.util.Map<java.lang.String,java.lang.Long> window_to_emitted; // optional
   private java.util.Map<java.lang.String,java.lang.Long> window_to_transferred; // optional
@@ -44,7 +44,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
   private java.util.Map<java.lang.String,java.lang.Long> window_to_failed; // 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 {
     WINDOW_TO_EMITTED((short)1, "window_to_emitted"),
     WINDOW_TO_TRANSFERRED((short)2, "window_to_transferred"),
     WINDOW_TO_COMPLETE_LATENCIES_MS((short)3, "window_to_complete_latencies_ms"),
@@ -115,31 +115,31 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.WINDOW_TO_EMITTED,_Fields.WINDOW_TO_TRANSFERRED,_Fields.WINDOW_TO_COMPLETE_LATENCIES_MS,_Fields.WINDOW_TO_ACKED,_Fields.WINDOW_TO_FAILED};
-  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.WINDOW_TO_EMITTED, new org.apache.thrift.meta_data.FieldMetaData("window_to_emitted", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    tmpMap.put(_Fields.WINDOW_TO_TRANSFERRED, new org.apache.thrift.meta_data.FieldMetaData("window_to_transferred", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    tmpMap.put(_Fields.WINDOW_TO_COMPLETE_LATENCIES_MS, new org.apache.thrift.meta_data.FieldMetaData("window_to_complete_latencies_ms", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))));
-    tmpMap.put(_Fields.WINDOW_TO_ACKED, new org.apache.thrift.meta_data.FieldMetaData("window_to_acked", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    tmpMap.put(_Fields.WINDOW_TO_FAILED, new org.apache.thrift.meta_data.FieldMetaData("window_to_failed", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
+    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.WINDOW_TO_EMITTED, new org.apache.storm.thrift.meta_data.FieldMetaData("window_to_emitted", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.WINDOW_TO_TRANSFERRED, new org.apache.storm.thrift.meta_data.FieldMetaData("window_to_transferred", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.WINDOW_TO_COMPLETE_LATENCIES_MS, new org.apache.storm.thrift.meta_data.FieldMetaData("window_to_complete_latencies_ms", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE))));
+    tmpMap.put(_Fields.WINDOW_TO_ACKED, new org.apache.storm.thrift.meta_data.FieldMetaData("window_to_acked", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.WINDOW_TO_FAILED, new org.apache.storm.thrift.meta_data.FieldMetaData("window_to_failed", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyStats.class, metaDataMap);
   }
 
   public TopologyStats() {
@@ -544,7 +544,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       return lastComparison;
     }
     if (is_set_window_to_emitted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_emitted, other.window_to_emitted);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.window_to_emitted, other.window_to_emitted);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -554,7 +554,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       return lastComparison;
     }
     if (is_set_window_to_transferred()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_transferred, other.window_to_transferred);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.window_to_transferred, other.window_to_transferred);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -564,7 +564,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       return lastComparison;
     }
     if (is_set_window_to_complete_latencies_ms()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_complete_latencies_ms, other.window_to_complete_latencies_ms);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.window_to_complete_latencies_ms, other.window_to_complete_latencies_ms);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -574,7 +574,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       return lastComparison;
     }
     if (is_set_window_to_acked()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_acked, other.window_to_acked);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.window_to_acked, other.window_to_acked);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -584,7 +584,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       return lastComparison;
     }
     if (is_set_window_to_failed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_failed, other.window_to_failed);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.window_to_failed, other.window_to_failed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -596,11 +596,11 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
     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);
   }
 
@@ -662,49 +662,49 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 TopologyStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyStatsStandardScheme getScheme() {
       return new TopologyStatsStandardScheme();
     }
   }
 
-  private static class TopologyStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<TopologyStats> {
+  private static class TopologyStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<TopologyStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, TopologyStats 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: // WINDOW_TO_EMITTED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map406 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map406 = iprot.readMapBegin();
                 struct.window_to_emitted = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map406.size);
                 java.lang.String _key407;
                 long _val408;
@@ -718,13 +718,13 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               }
               struct.set_window_to_emitted_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: // WINDOW_TO_TRANSFERRED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map410 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map410 = iprot.readMapBegin();
                 struct.window_to_transferred = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map410.size);
                 java.lang.String _key411;
                 long _val412;
@@ -738,13 +738,13 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               }
               struct.set_window_to_transferred_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: // WINDOW_TO_COMPLETE_LATENCIES_MS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map414 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map414 = iprot.readMapBegin();
                 struct.window_to_complete_latencies_ms = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map414.size);
                 java.lang.String _key415;
                 double _val416;
@@ -758,13 +758,13 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               }
               struct.set_window_to_complete_latencies_ms_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: // WINDOW_TO_ACKED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map418 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map418 = iprot.readMapBegin();
                 struct.window_to_acked = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map418.size);
                 java.lang.String _key419;
                 long _val420;
@@ -778,13 +778,13 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               }
               struct.set_window_to_acked_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: // WINDOW_TO_FAILED
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map422 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map422 = iprot.readMapBegin();
                 struct.window_to_failed = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map422.size);
                 java.lang.String _key423;
                 long _val424;
@@ -798,11 +798,11 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               }
               struct.set_window_to_failed_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();
       }
@@ -810,7 +810,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, TopologyStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -818,7 +818,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
         if (struct.is_set_window_to_emitted()) {
           oprot.writeFieldBegin(WINDOW_TO_EMITTED_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_emitted.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, struct.window_to_emitted.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter426 : struct.window_to_emitted.entrySet())
             {
               oprot.writeString(_iter426.getKey());
@@ -833,7 +833,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
         if (struct.is_set_window_to_transferred()) {
           oprot.writeFieldBegin(WINDOW_TO_TRANSFERRED_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_transferred.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, struct.window_to_transferred.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter427 : struct.window_to_transferred.entrySet())
             {
               oprot.writeString(_iter427.getKey());
@@ -848,7 +848,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
         if (struct.is_set_window_to_complete_latencies_ms()) {
           oprot.writeFieldBegin(WINDOW_TO_COMPLETE_LATENCIES_MS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.window_to_complete_latencies_ms.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, struct.window_to_complete_latencies_ms.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter428 : struct.window_to_complete_latencies_ms.entrySet())
             {
               oprot.writeString(_iter428.getKey());
@@ -863,7 +863,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
         if (struct.is_set_window_to_acked()) {
           oprot.writeFieldBegin(WINDOW_TO_ACKED_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_acked.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, struct.window_to_acked.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter429 : struct.window_to_acked.entrySet())
             {
               oprot.writeString(_iter429.getKey());
@@ -878,7 +878,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
         if (struct.is_set_window_to_failed()) {
           oprot.writeFieldBegin(WINDOW_TO_FAILED_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_failed.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, struct.window_to_failed.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter430 : struct.window_to_failed.entrySet())
             {
               oprot.writeString(_iter430.getKey());
@@ -895,17 +895,17 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
 
   }
 
-  private static class TopologyStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyStatsTupleScheme getScheme() {
       return new TopologyStatsTupleScheme();
     }
   }
 
-  private static class TopologyStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<TopologyStats> {
+  private static class TopologyStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<TopologyStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TopologyStats 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, TopologyStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_window_to_emitted()) {
         optionals.set(0);
@@ -976,12 +976,12 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TopologyStats 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, TopologyStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map436 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map436 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.window_to_emitted = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map436.size);
           java.lang.String _key437;
           long _val438;
@@ -996,7 +996,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map440 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map440 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.window_to_transferred = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map440.size);
           java.lang.String _key441;
           long _val442;
@@ -1011,7 +1011,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map444 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map444 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.DOUBLE, iprot.readI32());
           struct.window_to_complete_latencies_ms = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map444.size);
           java.lang.String _key445;
           double _val446;
@@ -1026,7 +1026,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TMap _map448 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map448 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.window_to_acked = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map448.size);
           java.lang.String _key449;
           long _val450;
@@ -1041,7 +1041,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TMap _map452 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map452 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.window_to_failed = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map452.size);
           java.lang.String _key453;
           long _val454;
@@ -1057,8 +1057,8 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
     }
   }
 
-  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/TopologyStatus.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyStatus.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyStatus.java
index 19a5cec..4f4c0ac 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyStatus.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyStatus.java
@@ -24,7 +24,7 @@
 package org.apache.storm.generated;
 
 
-public enum TopologyStatus implements org.apache.thrift.TEnum {
+public enum TopologyStatus implements org.apache.storm.thrift.TEnum {
   ACTIVE(1),
   INACTIVE(2),
   REBALANCING(3),


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ThriftSerializedObject.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ThriftSerializedObject.java b/storm-client/src/jvm/org/apache/storm/generated/ThriftSerializedObject.java
index 8a44842..82ff5f5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ThriftSerializedObject.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ThriftSerializedObject.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 ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSerializedObject, ThriftSerializedObject._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSerializedObject> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSerializedObject");
+public class ThriftSerializedObject implements org.apache.storm.thrift.TBase<ThriftSerializedObject, ThriftSerializedObject._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSerializedObject> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ThriftSerializedObject");
 
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField BITS_FIELD_DESC = new org.apache.thrift.protocol.TField("bits", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField BITS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bits", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftSerializedObjectStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftSerializedObjectTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftSerializedObjectStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftSerializedObjectTupleSchemeFactory();
 
   private java.lang.String name; // required
   private java.nio.ByteBuffer bits; // 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 {
     NAME((short)1, "name"),
     BITS((short)2, "bits");
 
@@ -99,15 +99,15 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
   }
 
   // isset id assignments
-  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.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BITS, new org.apache.thrift.meta_data.FieldMetaData("bits", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    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.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.BITS, new org.apache.storm.thrift.meta_data.FieldMetaData("bits", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftSerializedObject.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftSerializedObject.class, metaDataMap);
   }
 
   public ThriftSerializedObject() {
@@ -119,7 +119,7 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
   {
     this();
     this.name = name;
-    this.bits = org.apache.thrift.TBaseHelper.copyBinary(bits);
+    this.bits = org.apache.storm.thrift.TBaseHelper.copyBinary(bits);
   }
 
   /**
@@ -130,7 +130,7 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
       this.name = other.name;
     }
     if (other.is_set_bits()) {
-      this.bits = org.apache.thrift.TBaseHelper.copyBinary(other.bits);
+      this.bits = org.apache.storm.thrift.TBaseHelper.copyBinary(other.bits);
     }
   }
 
@@ -168,12 +168,12 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
   }
 
   public byte[] get_bits() {
-    set_bits(org.apache.thrift.TBaseHelper.rightSize(bits));
+    set_bits(org.apache.storm.thrift.TBaseHelper.rightSize(bits));
     return bits == null ? null : bits.array();
   }
 
   public java.nio.ByteBuffer buffer_for_bits() {
-    return org.apache.thrift.TBaseHelper.copyBinary(bits);
+    return org.apache.storm.thrift.TBaseHelper.copyBinary(bits);
   }
 
   public void set_bits(byte[] bits) {
@@ -181,7 +181,7 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
   }
 
   public void set_bits(java.nio.ByteBuffer bits) {
-    this.bits = org.apache.thrift.TBaseHelper.copyBinary(bits);
+    this.bits = org.apache.storm.thrift.TBaseHelper.copyBinary(bits);
   }
 
   public void unset_bits() {
@@ -315,7 +315,7 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -325,7 +325,7 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
       return lastComparison;
     }
     if (is_set_bits()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bits, other.bits);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.bits, other.bits);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -337,11 +337,11 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
     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);
   }
 
@@ -362,21 +362,21 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
     if (this.bits == null) {
       sb.append("null");
     } else {
-      org.apache.thrift.TBaseHelper.toString(this.bits, sb);
+      org.apache.storm.thrift.TBaseHelper.toString(this.bits, sb);
     }
     first = false;
     sb.append(")");
     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_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
     }
 
     if (!is_set_bits()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'bits' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'bits' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -384,56 +384,56 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
 
   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 ThriftSerializedObjectStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ThriftSerializedObjectStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ThriftSerializedObjectStandardScheme getScheme() {
       return new ThriftSerializedObjectStandardScheme();
     }
   }
 
-  private static class ThriftSerializedObjectStandardScheme extends org.apache.thrift.scheme.StandardScheme<ThriftSerializedObject> {
+  private static class ThriftSerializedObjectStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ThriftSerializedObject> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ThriftSerializedObject struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ThriftSerializedObject 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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // BITS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.bits = iprot.readBinary();
               struct.set_bits_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 ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ThriftSerializedObject struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ThriftSerializedObject struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -461,24 +461,24 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
 
   }
 
-  private static class ThriftSerializedObjectTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ThriftSerializedObjectTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ThriftSerializedObjectTupleScheme getScheme() {
       return new ThriftSerializedObjectTupleScheme();
     }
   }
 
-  private static class ThriftSerializedObjectTupleScheme extends org.apache.thrift.scheme.TupleScheme<ThriftSerializedObject> {
+  private static class ThriftSerializedObjectTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ThriftSerializedObject> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ThriftSerializedObject 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, ThriftSerializedObject struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.name);
       oprot.writeBinary(struct.bits);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ThriftSerializedObject 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, ThriftSerializedObject struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.name = iprot.readString();
       struct.set_name_isSet(true);
       struct.bits = iprot.readBinary();
@@ -486,8 +486,8 @@ public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSer
     }
   }
 
-  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/TopologyActionOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyActionOptions.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyActionOptions.java
index a0755aa..25b76c4 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyActionOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyActionOptions.java
@@ -24,13 +24,13 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActionOptions, TopologyActionOptions._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyActionOptions");
-  private static final org.apache.thrift.protocol.TField KILL_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("kill_options", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField REBALANCE_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("rebalance_options", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+public class TopologyActionOptions extends org.apache.storm.thrift.TUnion<TopologyActionOptions, TopologyActionOptions._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("TopologyActionOptions");
+  private static final org.apache.storm.thrift.protocol.TField KILL_OPTIONS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("kill_options", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField REBALANCE_OPTIONS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("rebalance_options", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
   /** 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 {
     KILL_OPTIONS((short)1, "kill_options"),
     REBALANCE_OPTIONS((short)2, "rebalance_options");
 
@@ -90,15 +90,15 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
     }
   }
 
-  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.KILL_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("kill_options", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, KillOptions.class)));
-    tmpMap.put(_Fields.REBALANCE_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("rebalance_options", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RebalanceOptions.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.KILL_OPTIONS, new org.apache.storm.thrift.meta_data.FieldMetaData("kill_options", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, KillOptions.class)));
+    tmpMap.put(_Fields.REBALANCE_OPTIONS, new org.apache.storm.thrift.meta_data.FieldMetaData("rebalance_options", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, RebalanceOptions.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyActionOptions.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyActionOptions.class, metaDataMap);
   }
 
   public TopologyActionOptions() {
@@ -148,7 +148,7 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -159,7 +159,7 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
             kill_options.read(iprot);
             return kill_options;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case REBALANCE_OPTIONS:
@@ -169,20 +169,20 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
             rebalance_options.read(iprot);
             return rebalance_options;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case KILL_OPTIONS:
         KillOptions kill_options = (KillOptions)value_;
@@ -198,7 +198,7 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
@@ -216,12 +216,12 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case KILL_OPTIONS:
         KillOptions kill_options = (KillOptions)value_;
@@ -237,7 +237,7 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case KILL_OPTIONS:
         return KILL_OPTIONS_FIELD_DESC;
@@ -249,7 +249,7 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -315,9 +315,9 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
 
   @Override
   public int compareTo(TopologyActionOptions other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -327,12 +327,12 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -341,8 +341,8 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
   }
   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);
     }
   }
@@ -350,8 +350,8 @@ public class TopologyActionOptions extends org.apache.thrift.TUnion<TopologyActi
 
   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);
     }
   }

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
index 2986a0c..c5cebce 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHistoryInfo, TopologyHistoryInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyHistoryInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyHistoryInfo");
+public class TopologyHistoryInfo implements org.apache.storm.thrift.TBase<TopologyHistoryInfo, TopologyHistoryInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyHistoryInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("TopologyHistoryInfo");
 
-  private static final org.apache.thrift.protocol.TField TOPO_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("topo_ids", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TOPO_IDS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topo_ids", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyHistoryInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyHistoryInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyHistoryInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyHistoryInfoTupleSchemeFactory();
 
   private java.util.List<java.lang.String> topo_ids; // 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 {
     TOPO_IDS((short)1, "topo_ids");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,14 +94,14 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
   }
 
   // isset id assignments
-  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.TOPO_IDS, new org.apache.thrift.meta_data.FieldMetaData("topo_ids", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        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))));
+    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.TOPO_IDS, new org.apache.storm.thrift.meta_data.FieldMetaData("topo_ids", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        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))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyHistoryInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyHistoryInfo.class, metaDataMap);
   }
 
   public TopologyHistoryInfo() {
@@ -257,7 +257,7 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
       return lastComparison;
     }
     if (is_set_topo_ids()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topo_ids, other.topo_ids);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topo_ids, other.topo_ids);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -269,11 +269,11 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
     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);
   }
 
@@ -293,49 +293,49 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 TopologyHistoryInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyHistoryInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyHistoryInfoStandardScheme getScheme() {
       return new TopologyHistoryInfoStandardScheme();
     }
   }
 
-  private static class TopologyHistoryInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TopologyHistoryInfo> {
+  private static class TopologyHistoryInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<TopologyHistoryInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyHistoryInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, TopologyHistoryInfo 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: // TOPO_IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list862 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list862 = iprot.readListBegin();
                 struct.topo_ids = new java.util.ArrayList<java.lang.String>(_list862.size);
                 java.lang.String _elem863;
                 for (int _i864 = 0; _i864 < _list862.size; ++_i864)
@@ -347,11 +347,11 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
               }
               struct.set_topo_ids_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();
       }
@@ -359,14 +359,14 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyHistoryInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, TopologyHistoryInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.topo_ids != null) {
         oprot.writeFieldBegin(TOPO_IDS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.topo_ids.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, struct.topo_ids.size()));
           for (java.lang.String _iter865 : struct.topo_ids)
           {
             oprot.writeString(_iter865);
@@ -381,17 +381,17 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
 
   }
 
-  private static class TopologyHistoryInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyHistoryInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyHistoryInfoTupleScheme getScheme() {
       return new TopologyHistoryInfoTupleScheme();
     }
   }
 
-  private static class TopologyHistoryInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TopologyHistoryInfo> {
+  private static class TopologyHistoryInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<TopologyHistoryInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TopologyHistoryInfo 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, TopologyHistoryInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_topo_ids()) {
         optionals.set(0);
@@ -409,12 +409,12 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TopologyHistoryInfo 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, TopologyHistoryInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list867 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list867 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRING, iprot.readI32());
           struct.topo_ids = new java.util.ArrayList<java.lang.String>(_list867.size);
           java.lang.String _elem868;
           for (int _i869 = 0; _i869 < _list867.size; ++_i869)
@@ -428,8 +428,8 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
     }
   }
 
-  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();
   }
 }
 


[50/50] [abbrv] storm git commit: Merge branch 'STORM-2882' of https://github.com/revans2/incubator-storm into STORM-2882

Posted by bo...@apache.org.
Merge branch 'STORM-2882' of https://github.com/revans2/incubator-storm into STORM-2882

STORM-2882: shade storm-client dependencies

this closes #2698


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

Branch: refs/heads/master
Commit: ab97687997c6b24a1c47cb2d84c07757501779eb
Parents: 3e098f1 35a1b8f
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 7 09:58:52 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 7 09:58:52 2018 -0500

----------------------------------------------------------------------
 DEVELOPER.md                                    |     2 -
 dev-tools/travis/travis-install.sh              |    11 +-
 dev-tools/travis/travis-script.sh               |     2 +-
 examples/storm-loadgen/pom.xml                  |    16 +
 examples/storm-perf/pom.xml                     |     4 +
 external/storm-kafka-client/pom.xml             |     4 +
 external/storm-kafka-migration/pom.xml          |     4 +
 external/storm-rocketmq/pom.xml                 |     4 +
 integration-test/pom.xml                        |     4 +
 .../st/tests/window/SlidingWindowTest.java      |    11 +-
 .../apache/storm/st/wrapper/StormCluster.java   |    17 +-
 .../org/apache/storm/st/wrapper/TopoWrap.java   |    53 +-
 pom.xml                                         |    37 +-
 shaded-deps/pom.xml                             |   290 +
 storm-client/pom.xml                            |   114 +-
 storm-client/src/genthrift.sh                   |     2 +-
 .../src/jvm/org/apache/storm/Config.java        |    11 +-
 .../src/jvm/org/apache/storm/ILocalCluster.java |     2 +-
 .../jvm/org/apache/storm/StormSubmitter.java    |    10 +-
 .../src/jvm/org/apache/storm/Thrift.java        |     2 +-
 .../LocalAssignmentsBackendFactory.java         |     2 +-
 .../org/apache/storm/blobstore/BlobStore.java   |     2 +-
 .../storm/blobstore/BlobStoreAclHandler.java    |     8 +-
 .../apache/storm/blobstore/NimbusBlobStore.java |     2 +-
 .../storm/callback/DefaultWatcherCallBack.java  |     2 +-
 .../apache/storm/callback/WatcherCallBack.java  |     4 +-
 .../storm/callback/ZKStateChangedCallback.java  |     2 +-
 .../storm/cluster/ClusterStateContext.java      |     2 +-
 .../org/apache/storm/cluster/ClusterUtils.java  |     8 +-
 .../org/apache/storm/cluster/DaemonType.java    |     6 +-
 .../org/apache/storm/cluster/IStateStorage.java |     4 +-
 .../storm/cluster/PaceMakerStateStorage.java    |     4 +-
 .../storm/cluster/StormClusterStateImpl.java    |    29 +-
 .../apache/storm/cluster/ZKStateStorage.java    |    21 +-
 .../storm/container/cgroup/CgroupUtils.java     |     2 +-
 .../storm/container/cgroup/SystemOperation.java |     2 +-
 .../org/apache/storm/daemon/GrouperFactory.java |     4 +-
 .../org/apache/storm/daemon/StormCommon.java    |     4 +-
 .../storm/daemon/supervisor/AdvancedFSOps.java  |     2 +-
 .../supervisor/ClientSupervisorUtils.java       |     2 +-
 .../org/apache/storm/daemon/worker/Worker.java  |    19 +-
 .../apache/storm/daemon/worker/WorkerState.java |     4 +-
 .../dependency/DependencyBlobStoreUtils.java    |     7 +-
 .../dependency/DependencyPropertiesParser.java  |    14 +-
 .../storm/dependency/DependencyUploader.java    |     2 +-
 .../storm/drpc/DRPCInvocationsClient.java       |     4 +-
 .../jvm/org/apache/storm/drpc/DRPCSpout.java    |     4 +-
 .../org/apache/storm/drpc/ReturnResults.java    |     9 +-
 .../jvm/org/apache/storm/executor/Executor.java |    10 +-
 .../org/apache/storm/executor/TupleInfo.java    |     4 +-
 .../storm/executor/bolt/BoltExecutor.java       |     2 +-
 .../storm/executor/spout/SpoutExecutor.java     |     2 +-
 .../apache/storm/generated/AccessControl.java   |   106 +-
 .../storm/generated/AccessControlType.java      |     2 +-
 .../storm/generated/AlreadyAliveException.java  |    74 +-
 .../org/apache/storm/generated/Assignment.java  |   212 +-
 .../storm/generated/AuthorizationException.java |    74 +-
 .../storm/generated/BeginDownloadResult.java    |   116 +-
 .../jvm/org/apache/storm/generated/Bolt.java    |    88 +-
 .../storm/generated/BoltAggregateStats.java     |   140 +-
 .../org/apache/storm/generated/BoltStats.java   |   230 +-
 .../apache/storm/generated/ClusterSummary.java  |   144 +-
 .../storm/generated/ClusterWorkerHeartbeat.java |   138 +-
 .../storm/generated/CommonAggregateStats.java   |   198 +-
 .../generated/ComponentAggregateStats.java      |   108 +-
 .../apache/storm/generated/ComponentCommon.java |   138 +-
 .../apache/storm/generated/ComponentObject.java |    74 +-
 .../storm/generated/ComponentPageInfo.java      |   334 +-
 .../apache/storm/generated/ComponentType.java   |     2 +-
 .../org/apache/storm/generated/Credentials.java |    84 +-
 .../storm/generated/DRPCExceptionType.java      |     2 +-
 .../storm/generated/DRPCExecutionException.java |    86 +-
 .../org/apache/storm/generated/DRPCRequest.java |    88 +-
 .../apache/storm/generated/DebugOptions.java    |    98 +-
 .../apache/storm/generated/DistributedRPC.java  |   286 +-
 .../generated/DistributedRPCInvocations.java    |   904 +-
 .../org/apache/storm/generated/ErrorInfo.java   |   124 +-
 .../storm/generated/ExecutorAggregateStats.java |    84 +-
 .../apache/storm/generated/ExecutorInfo.java    |   100 +-
 .../storm/generated/ExecutorSpecificStats.java  |    62 +-
 .../apache/storm/generated/ExecutorStats.java   |   164 +-
 .../apache/storm/generated/ExecutorSummary.java |   154 +-
 .../apache/storm/generated/GetInfoOptions.java  |    72 +-
 .../apache/storm/generated/GlobalStreamId.java  |    88 +-
 .../org/apache/storm/generated/Grouping.java    |   124 +-
 .../generated/HBAuthorizationException.java     |    74 +-
 .../storm/generated/HBExecutionException.java   |    74 +-
 .../org/apache/storm/generated/HBMessage.java   |   102 +-
 .../apache/storm/generated/HBMessageData.java   |    98 +-
 .../jvm/org/apache/storm/generated/HBNodes.java |    80 +-
 .../jvm/org/apache/storm/generated/HBPulse.java |    98 +-
 .../org/apache/storm/generated/HBRecords.java   |    80 +-
 .../storm/generated/HBServerMessageType.java    |     2 +-
 .../generated/InvalidTopologyException.java     |    74 +-
 .../org/apache/storm/generated/JavaObject.java  |    96 +-
 .../apache/storm/generated/JavaObjectArg.java   |    98 +-
 .../generated/KeyAlreadyExistsException.java    |    74 +-
 .../storm/generated/KeyNotFoundException.java   |    74 +-
 .../org/apache/storm/generated/KillOptions.java |    78 +-
 .../storm/generated/LSApprovedWorkers.java      |    84 +-
 .../generated/LSSupervisorAssignments.java      |    84 +-
 .../apache/storm/generated/LSSupervisorId.java  |    74 +-
 .../apache/storm/generated/LSTopoHistory.java   |   140 +-
 .../storm/generated/LSTopoHistoryList.java      |    82 +-
 .../storm/generated/LSWorkerHeartbeat.java      |   136 +-
 .../apache/storm/generated/ListBlobsResult.java |    96 +-
 .../apache/storm/generated/LocalAssignment.java |   140 +-
 .../apache/storm/generated/LocalStateData.java  |    84 +-
 .../org/apache/storm/generated/LogConfig.java   |    82 +-
 .../org/apache/storm/generated/LogLevel.java    |   136 +-
 .../apache/storm/generated/LogLevelAction.java  |     2 +-
 .../jvm/org/apache/storm/generated/Nimbus.java  | 11668 ++++++++---------
 .../apache/storm/generated/NimbusSummary.java   |   148 +-
 .../org/apache/storm/generated/NodeInfo.java    |    96 +-
 .../storm/generated/NotAliveException.java      |    74 +-
 .../org/apache/storm/generated/NullStruct.java  |    60 +-
 .../apache/storm/generated/NumErrorsChoice.java |     2 +-
 .../storm/generated/OwnerResourceSummary.java   |   408 +-
 .../storm/generated/PrivateWorkerKey.java       |   122 +-
 .../apache/storm/generated/ProfileAction.java   |     2 +-
 .../apache/storm/generated/ProfileRequest.java  |   108 +-
 .../storm/generated/ReadableBlobMeta.java       |    96 +-
 .../storm/generated/RebalanceOptions.java       |   174 +-
 .../storm/generated/SettableBlobMeta.java       |   100 +-
 .../apache/storm/generated/SharedMemory.java    |   134 +-
 .../apache/storm/generated/ShellComponent.java  |    84 +-
 .../storm/generated/SpecificAggregateStats.java |    62 +-
 .../storm/generated/SpoutAggregateStats.java    |    80 +-
 .../org/apache/storm/generated/SpoutSpec.java   |    88 +-
 .../org/apache/storm/generated/SpoutStats.java  |   162 +-
 .../apache/storm/generated/StateSpoutSpec.java  |    88 +-
 .../org/apache/storm/generated/StormBase.java   |   234 +-
 .../apache/storm/generated/StormTopology.java   |   274 +-
 .../org/apache/storm/generated/StreamInfo.java  |   102 +-
 .../apache/storm/generated/SubmitOptions.java   |    86 +-
 .../org/apache/storm/generated/Supervisor.java  |   686 +-
 .../storm/generated/SupervisorAssignments.java  |    82 +-
 .../apache/storm/generated/SupervisorInfo.java  |   246 +-
 .../storm/generated/SupervisorPageInfo.java     |   100 +-
 .../storm/generated/SupervisorSummary.java      |   266 +-
 .../generated/SupervisorWorkerHeartbeat.java    |   116 +-
 .../generated/SupervisorWorkerHeartbeats.java   |    96 +-
 .../storm/generated/ThriftSerializedObject.java |   100 +-
 .../storm/generated/TopologyActionOptions.java  |    62 +-
 .../storm/generated/TopologyHistoryInfo.java    |    80 +-
 .../apache/storm/generated/TopologyInfo.java    |   376 +-
 .../storm/generated/TopologyInitialStatus.java  |     2 +-
 .../storm/generated/TopologyPageInfo.java       |   620 +-
 .../apache/storm/generated/TopologyStats.java   |   170 +-
 .../apache/storm/generated/TopologyStatus.java  |     2 +-
 .../apache/storm/generated/TopologySummary.java |   372 +-
 .../storm/generated/WorkerMetricList.java       |    80 +-
 .../storm/generated/WorkerMetricPoint.java      |   160 +-
 .../apache/storm/generated/WorkerMetrics.java   |   122 +-
 .../apache/storm/generated/WorkerResources.java |   204 +-
 .../apache/storm/generated/WorkerSummary.java   |   326 +-
 .../org/apache/storm/generated/WorkerToken.java |   126 +-
 .../apache/storm/generated/WorkerTokenInfo.java |   132 +-
 .../storm/generated/WorkerTokenServiceType.java |     2 +-
 .../grouping/LoadAwareShuffleGrouping.java      |     4 +-
 .../storm/grouping/PartialKeyGrouping.java      |     3 +-
 .../messaging/netty/BackPressureStatus.java     |     4 +-
 .../apache/storm/messaging/netty/Client.java    |    18 +-
 .../apache/storm/messaging/netty/Context.java   |     4 +-
 .../storm/messaging/netty/ControlMessage.java   |     6 +-
 .../messaging/netty/INettySerializable.java     |     2 +-
 .../storm/messaging/netty/ISaslClient.java      |     2 +-
 .../storm/messaging/netty/ISaslServer.java      |     2 +-
 .../apache/storm/messaging/netty/IServer.java   |     2 +-
 .../netty/KerberosSaslClientHandler.java        |    12 +-
 .../netty/KerberosSaslNettyClient.java          |     6 +-
 .../netty/KerberosSaslNettyClientState.java     |     4 +-
 .../netty/KerberosSaslNettyServer.java          |     6 +-
 .../netty/KerberosSaslNettyServerState.java     |     4 +-
 .../netty/KerberosSaslServerHandler.java        |    12 +-
 .../org/apache/storm/messaging/netty/Login.java |     4 +-
 .../storm/messaging/netty/MessageBatch.java     |     6 +-
 .../storm/messaging/netty/MessageDecoder.java   |     8 +-
 .../storm/messaging/netty/MessageEncoder.java   |     6 +-
 .../netty/NettyRenameThreadFactory.java         |     4 +-
 .../storm/messaging/netty/SaslMessageToken.java |     6 +-
 .../messaging/netty/SaslNettyClientState.java   |     4 +-
 .../messaging/netty/SaslNettyServerState.java   |     4 +-
 .../messaging/netty/SaslStormClientHandler.java |    12 +-
 .../netty/SaslStormServerAuthorizeHandler.java  |    10 +-
 .../messaging/netty/SaslStormServerHandler.java |    12 +-
 .../apache/storm/messaging/netty/SaslUtils.java |     4 +-
 .../apache/storm/messaging/netty/Server.java    |    12 +-
 .../messaging/netty/StormClientHandler.java     |    10 +-
 .../netty/StormClientPipelineFactory.java       |     6 +-
 .../messaging/netty/StormServerHandler.java     |    12 +-
 .../netty/StormServerPipelineFactory.java       |     6 +-
 .../storm/metric/FileBasedEventLogger.java      |     2 +-
 .../storm/metric/MetricsConsumerBolt.java       |     6 +-
 .../storm/metric/filter/FilterByMetricName.java |    16 +-
 .../storm/metric/filter/MetricsFilter.java      |     2 +-
 .../apache/storm/multilang/JsonSerializer.java  |     6 +-
 .../apache/storm/pacemaker/PacemakerClient.java |    14 +-
 .../storm/pacemaker/PacemakerClientHandler.java |    12 +-
 .../storm/pacemaker/codec/ThriftDecoder.java    |     8 +-
 .../storm/pacemaker/codec/ThriftEncoder.java    |    10 +-
 .../pacemaker/codec/ThriftNettyClientCodec.java |    10 +-
 .../apache/storm/security/auth/AuthUtils.java   |   560 -
 .../org/apache/storm/security/auth/AutoSSL.java |     2 +-
 .../storm/security/auth/ClientAuthUtils.java    |   529 +
 .../auth/DefaultHttpCredentialsPlugin.java      |    91 -
 .../security/auth/IHttpCredentialsPlugin.java   |    44 -
 .../storm/security/auth/ITransportPlugin.java   |    10 +-
 .../apache/storm/security/auth/ReqContext.java  |     2 +-
 .../security/auth/ShellBasedGroupsMapping.java  |     2 +-
 .../security/auth/SimpleTransportPlugin.java    |    24 +-
 .../storm/security/auth/TBackoffConnect.java    |     4 +-
 .../storm/security/auth/ThriftClient.java       |    12 +-
 .../storm/security/auth/ThriftServer.java       |    10 +-
 .../authorizer/DRPCSimpleACLAuthorizer.java     |     6 +-
 .../authorizer/ImpersonationAuthorizer.java     |     8 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |     6 +-
 .../SupervisorSimpleACLAuthorizer.java          |     6 +-
 .../auth/digest/DigestSaslTransportPlugin.java  |    20 +-
 .../auth/digest/JassPasswordProvider.java       |     6 +-
 .../storm/security/auth/kerberos/AutoTGT.java   |    12 +-
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |     4 +-
 .../auth/kerberos/ClientCallbackHandler.java    |     6 +-
 .../kerberos/KerberosSaslTransportPlugin.java   |    36 +-
 .../security/auth/kerberos/NoOpTTrasport.java   |     6 +-
 .../auth/kerberos/ServerCallbackHandler.java    |     6 +-
 .../auth/plain/PlainSaslTransportPlugin.java    |    16 +-
 .../security/auth/sasl/SaslTransportPlugin.java |    24 +-
 .../auth/workertoken/WorkerTokenAuthorizer.java |    12 +-
 .../WorkerTokenClientCallbackHandler.java       |     4 +-
 .../serialization/BlowfishTupleSerializer.java  |     5 +-
 .../GzipThriftSerializationDelegate.java        |     8 +-
 .../ThriftSerializationDelegate.java            |     8 +-
 .../jvm/org/apache/storm/spout/ShellSpout.java  |     2 +-
 .../storm/state/BaseBinaryStateIterator.java    |     4 +-
 .../apache/storm/state/BaseStateIterator.java   |     4 +-
 .../apache/storm/stats/BoltExecutorStats.java   |     2 +-
 .../jvm/org/apache/storm/stats/StatsUtil.java   |     2 +-
 .../src/jvm/org/apache/storm/streams/Node.java  |     6 +-
 .../org/apache/storm/streams/ProcessorBolt.java |     4 +-
 .../storm/streams/ProcessorBoltDelegate.java    |    14 +-
 .../storm/streams/StatefulProcessorBolt.java    |     4 +-
 .../org/apache/storm/streams/StreamBuilder.java |    12 +-
 .../org/apache/storm/streams/StreamUtil.java    |     2 +-
 .../storm/streams/StreamsEdgeFactory.java       |     2 +-
 .../storm/streams/WindowedProcessorBolt.java    |     4 +-
 .../processors/CoGroupByKeyProcessor.java       |     4 +-
 .../processors/ForwardingProcessorContext.java  |     2 +-
 .../storm/streams/processors/JoinProcessor.java |     4 +-
 .../storm/task/GeneralTopologyContext.java      |     6 +-
 .../jvm/org/apache/storm/task/ShellBolt.java    |     2 +-
 .../org/apache/storm/task/TopologyContext.java  |     4 +-
 .../jvm/org/apache/storm/testing/TmpPath.java   |     2 +-
 .../storm/topology/ConfigurableTopology.java    |     7 +-
 .../apache/storm/topology/TopologyBuilder.java  |     2 +-
 .../state/TestTransactionalState.java           |     6 +-
 .../transactional/state/TransactionalState.java |    12 +-
 .../apache/storm/trident/TridentTopology.java   |    10 +-
 .../trident/drpc/ReturnResultsReducer.java      |    11 +-
 .../storm/trident/graph/GraphGrouper.java       |     3 +-
 .../org/apache/storm/trident/graph/Group.java   |     2 +-
 .../trident/operation/impl/ChainedResult.java   |     2 +-
 .../org/apache/storm/trident/planner/Node.java  |     5 +-
 .../storm/trident/planner/SubtopologyBolt.java  |     9 +-
 .../state/JSONNonTransactionalSerializer.java   |     5 +-
 .../trident/state/JSONOpaqueSerializer.java     |     4 +-
 .../state/JSONTransactionalSerializer.java      |     4 +-
 .../apache/storm/trident/state/OpaqueValue.java |     2 +-
 .../storm/trident/state/TransactionalValue.java |     3 +-
 .../storm/trident/testing/TuplifyArgs.java      |     4 +-
 .../trident/topology/TridentBoltExecutor.java   |     2 +-
 .../topology/TridentTopologyBuilder.java        |     4 +-
 .../state/RotatingTransactionalState.java       |     2 +-
 .../topology/state/TestTransactionalState.java  |     6 +-
 .../topology/state/TransactionalState.java      |    16 +-
 .../apache/storm/trident/tuple/ComboList.java   |     3 +-
 .../storm/trident/tuple/ValuePointer.java       |     2 +-
 .../storm/trident/util/ErrorEdgeFactory.java    |     2 +-
 .../apache/storm/trident/util/TridentUtils.java |     4 +-
 .../windowing/AbstractTridentWindowManager.java |     2 +-
 .../trident/windowing/WindowsStateUpdater.java  |     4 +-
 .../storm/trident/windowing/WindowsStore.java   |     2 +-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |     3 +-
 .../org/apache/storm/utils/CuratorUtils.java    |    16 +-
 .../jvm/org/apache/storm/utils/DRPCClient.java  |     4 +-
 .../src/jvm/org/apache/storm/utils/JCQueue.java |    22 +-
 .../jvm/org/apache/storm/utils/LocalState.java  |     8 +-
 .../org/apache/storm/utils/NimbusClient.java    |     6 +-
 .../StormBoundedExponentialBackoffRetry.java    |     2 +-
 .../apache/storm/utils/SupervisorClient.java    |     2 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |    37 +-
 .../org/apache/storm/utils/VersionedStore.java  |     2 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java |    77 -
 .../storm/windowing/TimeTriggerPolicy.java      |     2 +-
 .../storm/windowing/TupleWindowIterImpl.java    |     2 +-
 .../windowing/WaterMarkEventGenerator.java      |     2 +-
 .../apache/storm/windowing/WindowManager.java   |     2 +-
 .../windowing/persistence/WindowState.java      |     2 +-
 .../apache/storm/zookeeper/ClientZookeeper.java |    36 +-
 .../apache/storm/zookeeper/ZkEventTypes.java    |     2 +-
 .../apache/storm/zookeeper/ZkKeeperStates.java  |     2 +-
 .../org/apache/storm/TestConfigValidate.java    |     4 +-
 .../LocalAssignmentsBackendTest.java            |     3 +-
 .../apache/storm/cluster/DaemonTypeTest.java    |     6 +-
 .../DependencyPropertiesParserTest.java         |     2 +-
 .../dependency/DependencyUploaderTest.java      |     4 +-
 .../grouping/LoadAwareShuffleGroupingTest.java  |     6 +-
 .../storm/grouping/ShuffleGroupingTest.java     |     2 +-
 .../PartialKeyGroupingTest.java                 |     2 +-
 .../RandomTwoTaskAssignmentCreatorTest.java     |     2 +-
 .../metric/filter/FilterByMetricNameTest.java   |     4 +-
 .../metric/util/DataPointExpanderTest.java      |     2 +-
 .../storm/security/auth/AuthUtilsTest.java      |   230 -
 .../storm/security/auth/AuthUtilsTestMock.java  |    15 -
 .../apache/storm/security/auth/AutoSSLTest.java |     2 +-
 .../security/auth/ClientAuthUtilsTest.java      |   224 +
 .../auth/DefaultHttpCredentialsPluginTest.java  |    83 -
 .../storm/security/auth/ReqContextTest.java     |     2 +-
 .../storm/security/auth/ThriftClientTest.java   |     2 +-
 .../authorizer/DRPCSimpleACLAuthorizerTest.java |     2 +-
 .../BlowfishTupleSerializerTest.java            |     4 +-
 .../state/BaseBinaryStateIteratorTest.java      |     2 +-
 .../apache/storm/streams/ProcessorBoltTest.java |     6 +-
 .../streams/StatefulProcessorBoltTest.java      |     6 +-
 .../streams/WindowedProcessorBoltTest.java      |     6 +-
 .../PersistentWindowedBoltExecutorTest.java     |     2 +-
 .../storm/topology/TopologyBuilderTest.java     |     2 +-
 .../apache/storm/utils/CuratorUtilsTest.java    |    10 +-
 .../storm/utils/ShellBoltMessageQueueTest.java  |     2 +-
 .../storm/utils/ThriftTopologyUtilsTest.java    |     4 +-
 .../jvm/org/apache/storm/utils/UtilsTest.java   |     8 +-
 .../utils/ZookeeperServerCnxnFactoryTest.java   |    34 -
 .../src/clj/org/apache/storm/thrift.clj         |     2 +-
 storm-core/pom.xml                              |    91 +-
 storm-core/src/clj/org/apache/storm/ui/core.clj |     7 +-
 .../test/clj/org/apache/storm/cluster_test.clj  |     4 +-
 .../storm/security/auth/nimbus_auth_test.clj    |     2 +-
 .../clj/org/apache/storm/transactional_test.clj |     4 +-
 .../clj/org/apache/storm/trident/state_test.clj |     4 +-
 storm-server/pom.xml                            |    46 +-
 .../java/org/apache/storm/DaemonConfig.java     |    14 +
 .../ILocalClusterTrackedTopologyAware.java      |     2 +-
 .../java/org/apache/storm/LocalCluster.java     |     4 +-
 .../main/java/org/apache/storm/LocalDRPC.java   |     2 +-
 .../src/main/java/org/apache/storm/Testing.java |     2 +-
 .../apache/storm/blobstore/BlobStoreUtils.java  |     9 +-
 .../storm/blobstore/FileBlobStoreImpl.java      |     2 +-
 .../storm/blobstore/KeySequenceNumber.java      |     8 +-
 .../storm/blobstore/LocalFsBlobStore.java       |    13 +-
 .../blobstore/LocalFsBlobStoreSynchronizer.java |     2 +-
 .../java/org/apache/storm/daemon/drpc/DRPC.java |     2 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |    37 +-
 .../storm/daemon/supervisor/BasicContainer.java |     4 +-
 .../apache/storm/daemon/supervisor/Slot.java    |     2 +-
 .../storm/daemon/supervisor/Supervisor.java     |     6 +-
 .../timer/ReportWorkerHeartbeats.java           |     2 +-
 .../timer/SynchronizeAssignments.java           |     2 +-
 .../apache/storm/localizer/AsyncLocalizer.java  |     6 +-
 .../storm/localizer/LocalizedResource.java      |     2 +-
 .../LocalizedResourceRetentionSet.java          |     3 +-
 .../metricstore/NimbusMetricProcessor.java      |     2 +-
 .../storm/metricstore/rocksdb/RocksDbKey.java   |     2 +-
 .../storm/nimbus/LeaderListenerCallback.java    |    12 +-
 .../nimbus/NimbusHeartbeatsPressureTest.java    |     4 +-
 ...WorkerHeartbeatsRecoveryStrategyFactory.java |     2 +-
 .../org/apache/storm/pacemaker/Pacemaker.java   |     2 +-
 .../apache/storm/pacemaker/PacemakerServer.java |    18 +-
 .../pacemaker/codec/ThriftNettyServerCodec.java |    10 +-
 .../org/apache/storm/scheduler/Cluster.java     |     2 +-
 .../apache/storm/scheduler/EvenScheduler.java   |     4 +-
 .../scheduler/blacklist/BlacklistScheduler.java |     4 +-
 .../resource/ResourceAwareScheduler.java        |     2 +-
 .../normalization/NormalizedResources.java      |     2 +-
 .../scheduling/BaseResourceAwareStrategy.java   |     4 +-
 .../scheduling/ConstraintSolverStrategy.java    |     2 +-
 .../auth/DefaultHttpCredentialsPlugin.java      |    91 +
 .../security/auth/IHttpCredentialsPlugin.java   |    50 +
 .../storm/security/auth/ServerAuthUtils.java    |    62 +
 .../auth/workertoken/WorkerTokenManager.java    |     6 +-
 .../storm/testing/InProcessZookeeper.java       |     5 +-
 .../org/apache/storm/utils/ServerUtils.java     |     5 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java |    77 +
 .../apache/storm/zookeeper/AclEnforcement.java  |    12 +-
 .../storm/zookeeper/LeaderElectorImp.java       |    10 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   |    16 +-
 .../java/org/apache/storm/TestRebalance.java    |     2 +-
 .../LocalFsBlobStoreSynchronizerTest.java       |     6 +-
 .../blobstore/MockZookeeperClientBuilder.java   |    10 +-
 .../apache/storm/security/auth/AuthTest.java    |    21 +-
 .../auth/DefaultHttpCredentialsPluginTest.java  |    83 +
 .../security/auth/ServerAuthUtilsTest.java      |    62 +
 .../auth/workertoken/WorkerTokenTest.java       |     6 +-
 .../utils/ZookeeperServerCnxnFactoryTest.java   |    33 +
 .../apache/storm/daemon/drpc/DRPCServer.java    |     6 +-
 .../storm/daemon/drpc/webapp/DRPCResource.java  |     2 +-
 .../logviewer/utils/ResourceAuthorizer.java     |     6 +-
 .../logviewer/webapp/LogviewerApplication.java  |     4 +-
 397 files changed, 15393 insertions(+), 15181 deletions(-)
----------------------------------------------------------------------



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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
index f4a5a67..74c1c4b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
@@ -25,44 +25,44 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInfo, TopologyPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyPageInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyPageInfo");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)7);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField ID_TO_SPOUT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_spout_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)9);
-  private static final org.apache.thrift.protocol.TField ID_TO_BOLT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_bolt_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)10);
-  private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)11);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_stats", org.apache.thrift.protocol.TType.STRUCT, (short)12);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)13);
-  private static final org.apache.thrift.protocol.TField DEBUG_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("debug_options", org.apache.thrift.protocol.TType.STRUCT, (short)14);
-  private static final org.apache.thrift.protocol.TField REPLICATION_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("replication_count", org.apache.thrift.protocol.TType.I32, (short)15);
-  private static final org.apache.thrift.protocol.TField WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("workers", org.apache.thrift.protocol.TType.LIST, (short)16);
-  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)17);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_version", org.apache.thrift.protocol.TType.STRING, (short)18);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)521);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)522);
-  private static final org.apache.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)523);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)524);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)525);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)526);
-  private static final org.apache.thrift.protocol.TField REQUESTED_REGULAR_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_regular_on_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)527);
-  private static final org.apache.thrift.protocol.TField REQUESTED_SHARED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_shared_on_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)528);
-  private static final org.apache.thrift.protocol.TField REQUESTED_REGULAR_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_regular_off_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)529);
-  private static final org.apache.thrift.protocol.TField REQUESTED_SHARED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_shared_off_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)530);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_REGULAR_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_regular_on_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)531);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_SHARED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_shared_on_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)532);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_REGULAR_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_regular_off_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)533);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_SHARED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_shared_off_heap_memory", org.apache.thrift.protocol.TType.DOUBLE, (short)534);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyPageInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyPageInfoTupleSchemeFactory();
+public class TopologyPageInfo implements org.apache.storm.thrift.TBase<TopologyPageInfo, TopologyPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyPageInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("TopologyPageInfo");
+
+  private static final org.apache.storm.thrift.protocol.TField ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("status", org.apache.storm.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_tasks", org.apache.storm.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_workers", org.apache.storm.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_executors", org.apache.storm.thrift.protocol.TType.I32, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_CONF_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_conf", org.apache.storm.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField ID_TO_SPOUT_AGG_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id_to_spout_agg_stats", org.apache.storm.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField ID_TO_BOLT_AGG_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id_to_bolt_agg_stats", org.apache.storm.thrift.protocol.TType.MAP, (short)10);
+  private static final org.apache.storm.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("sched_status", org.apache.storm.thrift.protocol.TType.STRING, (short)11);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_stats", org.apache.storm.thrift.protocol.TType.STRUCT, (short)12);
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)13);
+  private static final org.apache.storm.thrift.protocol.TField DEBUG_OPTIONS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("debug_options", org.apache.storm.thrift.protocol.TType.STRUCT, (short)14);
+  private static final org.apache.storm.thrift.protocol.TField REPLICATION_COUNT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("replication_count", org.apache.storm.thrift.protocol.TType.I32, (short)15);
+  private static final org.apache.storm.thrift.protocol.TField WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("workers", org.apache.storm.thrift.protocol.TType.LIST, (short)16);
+  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)17);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_version", org.apache.storm.thrift.protocol.TType.STRING, (short)18);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)521);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)522);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)523);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)524);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)525);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)526);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_REGULAR_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_regular_on_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)527);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_SHARED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_shared_on_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)528);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_REGULAR_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_regular_off_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)529);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_SHARED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_shared_off_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)530);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_REGULAR_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_regular_on_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)531);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_SHARED_ON_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_shared_on_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)532);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_REGULAR_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_regular_off_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)533);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_SHARED_OFF_HEAP_MEMORY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_shared_off_heap_memory", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)534);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologyPageInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologyPageInfoTupleSchemeFactory();
 
   private java.lang.String id; // required
   private java.lang.String name; // optional
@@ -98,7 +98,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   private double assigned_shared_off_heap_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 {
     ID((short)1, "id"),
     NAME((short)2, "name"),
     UPTIME_SECS((short)3, "uptime_secs"),
@@ -270,80 +270,80 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   private static final int __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID = 18;
   private int __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.NAME,_Fields.UPTIME_SECS,_Fields.STATUS,_Fields.NUM_TASKS,_Fields.NUM_WORKERS,_Fields.NUM_EXECUTORS,_Fields.TOPOLOGY_CONF,_Fields.ID_TO_SPOUT_AGG_STATS,_Fields.ID_TO_BOLT_AGG_STATS,_Fields.SCHED_STATUS,_Fields.TOPOLOGY_STATS,_Fields.OWNER,_Fields.DEBUG_OPTIONS,_Fields.REPLICATION_COUNT,_Fields.WORKERS,_Fields.STORM_VERSION,_Fields.TOPOLOGY_VERSION,_Fields.REQUESTED_MEMONHEAP,_Fields.REQUESTED_MEMOFFHEAP,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_MEMONHEAP,_Fields.ASSIGNED_MEMOFFHEAP,_Fields.ASSIGNED_CPU,_Fields.REQUESTED_REGULAR_ON_HEAP_MEMORY,_Fields.REQUESTED_SHARED_ON_HEAP_MEMORY,_Fields.REQUESTED_REGULAR_OFF_HEAP_MEMORY,_Fields.REQUESTED_SHARED_OFF_HEAP_MEMORY,_Fields.ASSIGNED_REGULAR_ON_HEAP_MEMORY,_Fields.ASSIGNED_SHARED_ON_HEAP_MEMORY,_Fields.ASSIGNED_REGULAR_OFF_HEAP_MEMORY,_Fields.ASSIGNED_SHARED_OFF_HEAP_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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NUM_TASKS, new org.apache.thrift.meta_data.FieldMetaData("num_tasks", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOPOLOGY_CONF, new org.apache.thrift.meta_data.FieldMetaData("topology_conf", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ID_TO_SPOUT_AGG_STATS, new org.apache.thrift.meta_data.FieldMetaData("id_to_spout_agg_stats", 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, ComponentAggregateStats.class))));
-    tmpMap.put(_Fields.ID_TO_BOLT_AGG_STATS, new org.apache.thrift.meta_data.FieldMetaData("id_to_bolt_agg_stats", 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, ComponentAggregateStats.class))));
-    tmpMap.put(_Fields.SCHED_STATUS, new org.apache.thrift.meta_data.FieldMetaData("sched_status", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOPOLOGY_STATS, new org.apache.thrift.meta_data.FieldMetaData("topology_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TopologyStats.class)));
-    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debug_options", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DebugOptions.class)));
-    tmpMap.put(_Fields.REPLICATION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("replication_count", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.WORKERS, new org.apache.thrift.meta_data.FieldMetaData("workers", 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, WorkerSummary.class))));
-    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.TOPOLOGY_VERSION, new org.apache.thrift.meta_data.FieldMetaData("topology_version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_REGULAR_ON_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_regular_on_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_SHARED_ON_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_shared_on_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_REGULAR_OFF_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_regular_off_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_SHARED_OFF_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("requested_shared_off_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_REGULAR_ON_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("assigned_regular_on_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_SHARED_ON_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("assigned_shared_on_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_REGULAR_OFF_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("assigned_regular_off_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_SHARED_OFF_HEAP_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("assigned_shared_off_heap_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.ID, new org.apache.storm.thrift.meta_data.FieldMetaData("id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("status", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NUM_TASKS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_tasks", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_workers", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_executors", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOPOLOGY_CONF, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_conf", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ID_TO_SPOUT_AGG_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("id_to_spout_agg_stats", 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, ComponentAggregateStats.class))));
+    tmpMap.put(_Fields.ID_TO_BOLT_AGG_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("id_to_bolt_agg_stats", 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, ComponentAggregateStats.class))));
+    tmpMap.put(_Fields.SCHED_STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("sched_status", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOPOLOGY_STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_stats", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, TopologyStats.class)));
+    tmpMap.put(_Fields.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.storm.thrift.meta_data.FieldMetaData("debug_options", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, DebugOptions.class)));
+    tmpMap.put(_Fields.REPLICATION_COUNT, new org.apache.storm.thrift.meta_data.FieldMetaData("replication_count", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("workers", 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.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, WorkerSummary.class))));
+    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.TOPOLOGY_VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_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.REQUESTED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_REGULAR_ON_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_regular_on_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_SHARED_ON_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_shared_on_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_REGULAR_OFF_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_regular_off_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_SHARED_OFF_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_shared_off_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_REGULAR_ON_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_regular_on_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_SHARED_ON_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_shared_on_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_REGULAR_OFF_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_regular_off_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_SHARED_OFF_HEAP_MEMORY, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_shared_off_heap_memory", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyPageInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyPageInfo.class, metaDataMap);
   }
 
   public TopologyPageInfo() {
@@ -564,16 +564,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_status() {
@@ -609,16 +609,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_num_tasks() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   /** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_tasks() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   public void set_num_tasks_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
   }
 
   public int get_num_workers() {
@@ -631,16 +631,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_num_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   public void set_num_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
   }
 
   public int get_num_executors() {
@@ -653,16 +653,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_num_executors() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_executors() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   public void set_num_executors_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
   }
 
   public java.lang.String get_topology_conf() {
@@ -858,16 +858,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_replication_count() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   /** Returns true if field replication_count is set (has been assigned a value) and false otherwise */
   public boolean is_set_replication_count() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   public void set_replication_count_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
   }
 
   public int get_workers_size() {
@@ -964,16 +964,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_requested_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_requested_memoffheap() {
@@ -986,16 +986,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_requested_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_requested_cpu() {
@@ -1008,16 +1008,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   public void set_requested_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
   }
 
   public double get_assigned_memonheap() {
@@ -1030,16 +1030,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_assigned_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_memoffheap() {
@@ -1052,16 +1052,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_assigned_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_cpu() {
@@ -1074,16 +1074,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   /** Returns true if field assigned_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   public void set_assigned_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
   }
 
   public double get_requested_regular_on_heap_memory() {
@@ -1096,16 +1096,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_regular_on_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_regular_on_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_regular_on_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_requested_regular_on_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_REGULAR_ON_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_REGULAR_ON_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_requested_shared_on_heap_memory() {
@@ -1118,16 +1118,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_shared_on_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_shared_on_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_shared_on_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_requested_shared_on_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_SHARED_ON_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_SHARED_ON_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_requested_regular_off_heap_memory() {
@@ -1140,16 +1140,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_regular_off_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_regular_off_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_regular_off_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_requested_regular_off_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_requested_shared_off_heap_memory() {
@@ -1162,16 +1162,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_requested_shared_off_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field requested_shared_off_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_shared_off_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_requested_shared_off_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_SHARED_OFF_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_SHARED_OFF_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_assigned_regular_on_heap_memory() {
@@ -1184,16 +1184,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_regular_on_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field assigned_regular_on_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_regular_on_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_REGULAR_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_assigned_regular_on_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_REGULAR_ON_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_REGULAR_ON_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_assigned_shared_on_heap_memory() {
@@ -1206,16 +1206,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_shared_on_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field assigned_shared_on_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_shared_on_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_SHARED_ON_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_assigned_shared_on_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_SHARED_ON_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_SHARED_ON_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_assigned_regular_off_heap_memory() {
@@ -1228,16 +1228,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_regular_off_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field assigned_regular_off_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_regular_off_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_assigned_regular_off_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_REGULAR_OFF_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public double get_assigned_shared_off_heap_memory() {
@@ -1250,16 +1250,16 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   }
 
   public void unset_assigned_shared_off_heap_memory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   /** Returns true if field assigned_shared_off_heap_memory is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_shared_off_heap_memory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID);
   }
 
   public void set_assigned_shared_off_heap_memory_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_SHARED_OFF_HEAP_MEMORY_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -2084,59 +2084,59 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
 
     hashCode = hashCode * 8191 + ((is_set_requested_memonheap()) ? 131071 : 524287);
     if (is_set_requested_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_memoffheap()) ? 131071 : 524287);
     if (is_set_requested_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287);
     if (is_set_requested_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memonheap()) ? 131071 : 524287);
     if (is_set_assigned_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memoffheap()) ? 131071 : 524287);
     if (is_set_assigned_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_cpu()) ? 131071 : 524287);
     if (is_set_assigned_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_requested_regular_on_heap_memory()) ? 131071 : 524287);
     if (is_set_requested_regular_on_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_regular_on_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_regular_on_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_requested_shared_on_heap_memory()) ? 131071 : 524287);
     if (is_set_requested_shared_on_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_shared_on_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_shared_on_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_requested_regular_off_heap_memory()) ? 131071 : 524287);
     if (is_set_requested_regular_off_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_regular_off_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_regular_off_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_requested_shared_off_heap_memory()) ? 131071 : 524287);
     if (is_set_requested_shared_off_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_shared_off_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_shared_off_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_regular_on_heap_memory()) ? 131071 : 524287);
     if (is_set_assigned_regular_on_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_regular_on_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_regular_on_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_shared_on_heap_memory()) ? 131071 : 524287);
     if (is_set_assigned_shared_on_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_shared_on_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_shared_on_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_regular_off_heap_memory()) ? 131071 : 524287);
     if (is_set_assigned_regular_off_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_regular_off_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_regular_off_heap_memory);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_shared_off_heap_memory()) ? 131071 : 524287);
     if (is_set_assigned_shared_off_heap_memory())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_shared_off_heap_memory);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_shared_off_heap_memory);
 
     return hashCode;
   }
@@ -2154,7 +2154,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id, other.id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2164,7 +2164,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2174,7 +2174,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2184,7 +2184,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2194,7 +2194,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_num_tasks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2204,7 +2204,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_num_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2214,7 +2214,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_num_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2224,7 +2224,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_topology_conf()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_conf, other.topology_conf);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_conf, other.topology_conf);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2234,7 +2234,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_id_to_spout_agg_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id_to_spout_agg_stats, other.id_to_spout_agg_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id_to_spout_agg_stats, other.id_to_spout_agg_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2244,7 +2244,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_id_to_bolt_agg_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id_to_bolt_agg_stats, other.id_to_bolt_agg_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id_to_bolt_agg_stats, other.id_to_bolt_agg_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2254,7 +2254,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_sched_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2264,7 +2264,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_topology_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_stats, other.topology_stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_stats, other.topology_stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2274,7 +2274,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2284,7 +2284,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_debug_options()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.debug_options, other.debug_options);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.debug_options, other.debug_options);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2294,7 +2294,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_replication_count()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_count, other.replication_count);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.replication_count, other.replication_count);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2304,7 +2304,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workers, other.workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.workers, other.workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2314,7 +2314,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       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;
       }
@@ -2324,7 +2324,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_topology_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_version, other.topology_version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_version, other.topology_version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2334,7 +2334,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2344,7 +2344,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2354,7 +2354,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2364,7 +2364,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2374,7 +2374,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2384,7 +2384,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2394,7 +2394,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_regular_on_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_regular_on_heap_memory, other.requested_regular_on_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_regular_on_heap_memory, other.requested_regular_on_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2404,7 +2404,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_shared_on_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_shared_on_heap_memory, other.requested_shared_on_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_shared_on_heap_memory, other.requested_shared_on_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2414,7 +2414,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_regular_off_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_regular_off_heap_memory, other.requested_regular_off_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_regular_off_heap_memory, other.requested_regular_off_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2424,7 +2424,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_requested_shared_off_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_shared_off_heap_memory, other.requested_shared_off_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_shared_off_heap_memory, other.requested_shared_off_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2434,7 +2434,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_regular_on_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_regular_on_heap_memory, other.assigned_regular_on_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_regular_on_heap_memory, other.assigned_regular_on_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2444,7 +2444,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_shared_on_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_shared_on_heap_memory, other.assigned_shared_on_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_shared_on_heap_memory, other.assigned_shared_on_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2454,7 +2454,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_regular_off_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_regular_off_heap_memory, other.assigned_regular_off_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_regular_off_heap_memory, other.assigned_regular_off_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2464,7 +2464,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       return lastComparison;
     }
     if (is_set_assigned_shared_off_heap_memory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_shared_off_heap_memory, other.assigned_shared_off_heap_memory);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_shared_off_heap_memory, other.assigned_shared_off_heap_memory);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2476,11 +2476,11 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
     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);
   }
 
@@ -2734,10 +2734,10 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
     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_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -2751,8 +2751,8 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
 
   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);
     }
   }
@@ -2761,98 +2761,98 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
     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 TopologyPageInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologyPageInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologyPageInfoStandardScheme getScheme() {
       return new TopologyPageInfoStandardScheme();
     }
   }
 
-  private static class TopologyPageInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TopologyPageInfo> {
+  private static class TopologyPageInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<TopologyPageInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyPageInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, TopologyPageInfo 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: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.id = iprot.readString();
               struct.set_id_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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.status = iprot.readString();
               struct.set_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 5: // NUM_TASKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_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: // NUM_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_workers = iprot.readI32();
               struct.set_num_workers_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: // NUM_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_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: // TOPOLOGY_CONF
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_conf = iprot.readString();
               struct.set_topology_conf_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: // ID_TO_SPOUT_AGG_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map482 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map482 = iprot.readMapBegin();
                 struct.id_to_spout_agg_stats = new java.util.HashMap<java.lang.String,ComponentAggregateStats>(2*_map482.size);
                 java.lang.String _key483;
                 ComponentAggregateStats _val484;
@@ -2867,13 +2867,13 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               }
               struct.set_id_to_spout_agg_stats_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: // ID_TO_BOLT_AGG_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
            

<TRUNCATED>

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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java b/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
index 3955ddc..9fcc8ee 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
@@ -29,23 +29,23 @@ public class Nimbus {
 
   public interface Iface {
 
-    public void submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException;
+    public void submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException;
+    public void submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void killTopology(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public void killTopology(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void killTopologyWithOpts(java.lang.String name, KillOptions options) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public void killTopologyWithOpts(java.lang.String name, KillOptions options) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void activate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public void activate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void deactivate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public void deactivate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void rebalance(java.lang.String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException;
+    public void rebalance(java.lang.String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void setLogConfig(java.lang.String name, LogConfig config) throws org.apache.thrift.TException;
+    public void setLogConfig(java.lang.String name, LogConfig config) throws org.apache.storm.thrift.TException;
 
-    public LogConfig getLogConfig(java.lang.String name) throws org.apache.thrift.TException;
+    public LogConfig getLogConfig(java.lang.String name) throws org.apache.storm.thrift.TException;
 
     /**
      * Enable/disable logging the tuples generated in topology via an internal EventLogger bolt. The component name is optional
@@ -59,255 +59,255 @@ public class Nimbus {
      * @param enable
      * @param samplingPercentage
      */
-    public void debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public void debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest) throws org.apache.thrift.TException;
+    public void setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest) throws org.apache.storm.thrift.TException;
 
-    public java.util.List<ProfileRequest> getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action) throws org.apache.thrift.TException;
+    public java.util.List<ProfileRequest> getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action) throws org.apache.storm.thrift.TException;
 
-    public void uploadNewCredentials(java.lang.String name, Credentials creds) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException;
+    public void uploadNewCredentials(java.lang.String name, Credentials creds) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public java.lang.String beginCreateBlob(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyAlreadyExistsException, org.apache.thrift.TException;
+    public java.lang.String beginCreateBlob(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyAlreadyExistsException, org.apache.storm.thrift.TException;
 
-    public java.lang.String beginUpdateBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public java.lang.String beginUpdateBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public void uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.thrift.TException;
+    public void uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void finishBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.thrift.TException;
+    public void finishBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void cancelBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.thrift.TException;
+    public void cancelBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public ReadableBlobMeta getBlobMeta(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public ReadableBlobMeta getBlobMeta(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public void setBlobMeta(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public void setBlobMeta(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public BeginDownloadResult beginBlobDownload(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public BeginDownloadResult beginBlobDownload(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public java.nio.ByteBuffer downloadBlobChunk(java.lang.String session) throws AuthorizationException, org.apache.thrift.TException;
+    public java.nio.ByteBuffer downloadBlobChunk(java.lang.String session) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void deleteBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public void deleteBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public ListBlobsResult listBlobs(java.lang.String session) throws org.apache.thrift.TException;
+    public ListBlobsResult listBlobs(java.lang.String session) throws org.apache.storm.thrift.TException;
 
-    public int getBlobReplication(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public int getBlobReplication(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public int updateBlobReplication(java.lang.String key, int replication) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException;
+    public int updateBlobReplication(java.lang.String key, int replication) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException;
 
-    public void createStateInZookeeper(java.lang.String key) throws org.apache.thrift.TException;
+    public void createStateInZookeeper(java.lang.String key) throws org.apache.storm.thrift.TException;
 
-    public java.lang.String beginFileUpload() throws AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String beginFileUpload() throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.thrift.TException;
+    public void uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public void finishFileUpload(java.lang.String location) throws AuthorizationException, org.apache.thrift.TException;
+    public void finishFileUpload(java.lang.String location) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public java.lang.String beginFileDownload(java.lang.String file) throws AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String beginFileDownload(java.lang.String file) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public java.nio.ByteBuffer downloadChunk(java.lang.String id) throws AuthorizationException, org.apache.thrift.TException;
+    public java.nio.ByteBuffer downloadChunk(java.lang.String id) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public java.lang.String getNimbusConf() throws AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String getNimbusConf() throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public ClusterSummary getClusterInfo() throws AuthorizationException, org.apache.thrift.TException;
+    public ClusterSummary getClusterInfo() throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public NimbusSummary getLeader() throws AuthorizationException, org.apache.thrift.TException;
+    public NimbusSummary getLeader() throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public boolean isTopologyNameAllowed(java.lang.String name) throws AuthorizationException, org.apache.thrift.TException;
+    public boolean isTopologyNameAllowed(java.lang.String name) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public TopologyInfo getTopologyInfo(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public TopologyInfo getTopologyInfo(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public TopologyInfo getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public TopologyInfo getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public TopologyPageInfo getTopologyPageInfo(java.lang.String id, java.lang.String window, boolean is_include_sys) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public TopologyPageInfo getTopologyPageInfo(java.lang.String id, java.lang.String window, boolean is_include_sys) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public SupervisorPageInfo getSupervisorPageInfo(java.lang.String id, java.lang.String host, boolean is_include_sys) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public SupervisorPageInfo getSupervisorPageInfo(java.lang.String id, java.lang.String host, boolean is_include_sys) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public ComponentPageInfo getComponentPageInfo(java.lang.String topology_id, java.lang.String component_id, java.lang.String window, boolean is_include_sys) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public ComponentPageInfo getComponentPageInfo(java.lang.String topology_id, java.lang.String component_id, java.lang.String window, boolean is_include_sys) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public java.lang.String getTopologyConf(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String getTopologyConf(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Returns the compiled topology that contains ackers and metrics consumsers. Compare {@link #getUserTopology(String id)}.
      * 
      * @param id
      */
-    public StormTopology getTopology(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public StormTopology getTopology(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Returns the user specified topology as submitted originally. Compare {@link #getTopology(String id)}.
      * 
      * @param id
      */
-    public StormTopology getUserTopology(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+    public StormTopology getUserTopology(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException;
 
-    public TopologyHistoryInfo getTopologyHistory(java.lang.String user) throws AuthorizationException, org.apache.thrift.TException;
+    public TopologyHistoryInfo getTopologyHistory(java.lang.String user) throws AuthorizationException, org.apache.storm.thrift.TException;
 
-    public java.util.List<OwnerResourceSummary> getOwnerResourceSummaries(java.lang.String owner) throws AuthorizationException, org.apache.thrift.TException;
+    public java.util.List<OwnerResourceSummary> getOwnerResourceSummaries(java.lang.String owner) throws AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Get assigned assignments for a specific supervisor
      * 
      * @param node
      */
-    public SupervisorAssignments getSupervisorAssignments(java.lang.String node) throws AuthorizationException, org.apache.thrift.TException;
+    public SupervisorAssignments getSupervisorAssignments(java.lang.String node) throws AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Send supervisor worker heartbeats for a specific supervisor
      * 
      * @param heartbeats
      */
-    public void sendSupervisorWorkerHeartbeats(SupervisorWorkerHeartbeats heartbeats) throws AuthorizationException, org.apache.thrift.TException;
+    public void sendSupervisorWorkerHeartbeats(SupervisorWorkerHeartbeats heartbeats) throws AuthorizationException, org.apache.storm.thrift.TException;
 
     /**
      * Send supervisor local worker heartbeat when a supervisor is unreachable
      * 
      * @param heatbeat
      */
-    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heatbeat) throws AuthorizationException, NotAliveException, org.apache.thrift.TException;
+    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heatbeat) throws AuthorizationException, NotAliveException, org.apache.storm.thrift.TException;
 
-    public void processWorkerMetrics(WorkerMetrics metrics) throws org.apache.thrift.TException;
+    public void processWorkerMetrics(WorkerMetrics metrics) throws org.apache.storm.thrift.TException;
 
     /**
      * Decide if the blob is removed from cluster.
      * 
      * @param blobKey
      */
-    public boolean isRemoteBlobExists(java.lang.String blobKey) throws AuthorizationException, org.apache.thrift.TException;
+    public boolean isRemoteBlobExists(java.lang.String blobKey) throws AuthorizationException, org.apache.storm.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void killTopology(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void killTopology(java.lang.String name, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void killTopologyWithOpts(java.lang.String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void killTopologyWithOpts(java.lang.String name, KillOptions options, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void activate(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void activate(java.lang.String name, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void deactivate(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void deactivate(java.lang.String name, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void rebalance(java.lang.String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void rebalance(java.lang.String name, RebalanceOptions options, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void setLogConfig(java.lang.String name, LogConfig config, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void setLogConfig(java.lang.String name, LogConfig config, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getLogConfig(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<LogConfig> resultHandler) throws org.apache.thrift.TException;
+    public void getLogConfig(java.lang.String name, org.apache.storm.thrift.async.AsyncMethodCallback<LogConfig> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ProfileRequest>> resultHandler) throws org.apache.thrift.TException;
+    public void getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action, org.apache.storm.thrift.async.AsyncMethodCallback<java.util.List<ProfileRequest>> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void uploadNewCredentials(java.lang.String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void uploadNewCredentials(java.lang.String name, Credentials creds, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void beginCreateBlob(java.lang.String key, SettableBlobMeta meta, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void beginCreateBlob(java.lang.String key, SettableBlobMeta meta, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void beginUpdateBlob(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void beginUpdateBlob(java.lang.String key, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void finishBlobUpload(java.lang.String session, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void finishBlobUpload(java.lang.String session, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void cancelBlobUpload(java.lang.String session, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void cancelBlobUpload(java.lang.String session, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getBlobMeta(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<ReadableBlobMeta> resultHandler) throws org.apache.thrift.TException;
+    public void getBlobMeta(java.lang.String key, org.apache.storm.thrift.async.AsyncMethodCallback<ReadableBlobMeta> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void setBlobMeta(java.lang.String key, SettableBlobMeta meta, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void setBlobMeta(java.lang.String key, SettableBlobMeta meta, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void beginBlobDownload(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<BeginDownloadResult> resultHandler) throws org.apache.thrift.TException;
+    public void beginBlobDownload(java.lang.String key, org.apache.storm.thrift.async.AsyncMethodCallback<BeginDownloadResult> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void downloadBlobChunk(java.lang.String session, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException;
+    public void downloadBlobChunk(java.lang.String session, org.apache.storm.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void deleteBlob(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void deleteBlob(java.lang.String key, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void listBlobs(java.lang.String session, org.apache.thrift.async.AsyncMethodCallback<ListBlobsResult> resultHandler) throws org.apache.thrift.TException;
+    public void listBlobs(java.lang.String session, org.apache.storm.thrift.async.AsyncMethodCallback<ListBlobsResult> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getBlobReplication(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
+    public void getBlobReplication(java.lang.String key, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void updateBlobReplication(java.lang.String key, int replication, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
+    public void updateBlobReplication(java.lang.String key, int replication, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void createStateInZookeeper(java.lang.String key, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void createStateInZookeeper(java.lang.String key, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void beginFileUpload(org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void finishFileUpload(java.lang.String location, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void finishFileUpload(java.lang.String location, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void beginFileDownload(java.lang.String file, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void beginFileDownload(java.lang.String file, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void downloadChunk(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException;
+    public void downloadChunk(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void getNimbusConf(org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback<ClusterSummary> resultHandler) throws org.apache.thrift.TException;
+    public void getClusterInfo(org.apache.storm.thrift.async.AsyncMethodCallback<ClusterSummary> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getLeader(org.apache.thrift.async.AsyncMethodCallback<NimbusSummary> resultHandler) throws org.apache.thrift.TException;
+    public void getLeader(org.apache.storm.thrift.async.AsyncMethodCallback<NimbusSummary> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void isTopologyNameAllowed(java.lang.String name, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void isTopologyNameAllowed(java.lang.String name, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getTopologyInfo(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<TopologyInfo> resultHandler) throws org.apache.thrift.TException;
+    public void getTopologyInfo(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<TopologyInfo> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback<TopologyInfo> resultHandler) throws org.apache.thrift.TException;
+    public void getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options, org.apache.storm.thrift.async.AsyncMethodCallback<TopologyInfo> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getTopologyPageInfo(java.lang.String id, java.lang.String window, boolean is_include_sys, org.apache.thrift.async.AsyncMethodCallback<TopologyPageInfo> resultHandler) throws org.apache.thrift.TException;
+    public void getTopologyPageInfo(java.lang.String id, java.lang.String window, boolean is_include_sys, org.apache.storm.thrift.async.AsyncMethodCallback<TopologyPageInfo> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getSupervisorPageInfo(java.lang.String id, java.lang.String host, boolean is_include_sys, org.apache.thrift.async.AsyncMethodCallback<SupervisorPageInfo> resultHandler) throws org.apache.thrift.TException;
+    public void getSupervisorPageInfo(java.lang.String id, java.lang.String host, boolean is_include_sys, org.apache.storm.thrift.async.AsyncMethodCallback<SupervisorPageInfo> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getComponentPageInfo(java.lang.String topology_id, java.lang.String component_id, java.lang.String window, boolean is_include_sys, org.apache.thrift.async.AsyncMethodCallback<ComponentPageInfo> resultHandler) throws org.apache.thrift.TException;
+    public void getComponentPageInfo(java.lang.String topology_id, java.lang.String component_id, java.lang.String window, boolean is_include_sys, org.apache.storm.thrift.async.AsyncMethodCallback<ComponentPageInfo> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getTopologyConf(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void getTopologyConf(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getTopology(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<StormTopology> resultHandler) throws org.apache.thrift.TException;
+    public void getTopology(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<StormTopology> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getUserTopology(java.lang.String id, org.apache.thrift.async.AsyncMethodCallback<StormTopology> resultHandler) throws org.apache.thrift.TException;
+    public void getUserTopology(java.lang.String id, org.apache.storm.thrift.async.AsyncMethodCallback<StormTopology> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getTopologyHistory(java.lang.String user, org.apache.thrift.async.AsyncMethodCallback<TopologyHistoryInfo> resultHandler) throws org.apache.thrift.TException;
+    public void getTopologyHistory(java.lang.String user, org.apache.storm.thrift.async.AsyncMethodCallback<TopologyHistoryInfo> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getOwnerResourceSummaries(java.lang.String owner, org.apache.thrift.async.AsyncMethodCallback<java.util.List<OwnerResourceSummary>> resultHandler) throws org.apache.thrift.TException;
+    public void getOwnerResourceSummaries(java.lang.String owner, org.apache.storm.thrift.async.AsyncMethodCallback<java.util.List<OwnerResourceSummary>> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void getSupervisorAssignments(java.lang.String node, org.apache.thrift.async.AsyncMethodCallback<SupervisorAssignments> resultHandler) throws org.apache.thrift.TException;
+    public void getSupervisorAssignments(java.lang.String node, org.apache.storm.thrift.async.AsyncMethodCallback<SupervisorAssignments> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void sendSupervisorWorkerHeartbeats(SupervisorWorkerHeartbeats heartbeats, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void sendSupervisorWorkerHeartbeats(SupervisorWorkerHeartbeats heartbeats, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heatbeat, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void sendSupervisorWorkerHeartbeat(SupervisorWorkerHeartbeat heatbeat, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void processWorkerMetrics(WorkerMetrics metrics, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void processWorkerMetrics(WorkerMetrics metrics, org.apache.storm.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.storm.thrift.TException;
 
-    public void isRemoteBlobExists(java.lang.String blobKey, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void isRemoteBlobExists(java.lang.String blobKey, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.storm.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
-    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+  public static class Client extends org.apache.storm.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.storm.thrift.TServiceClientFactory<Client> {
       public Factory() {}
-      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
-      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol prot)
+    public Client(org.apache.storm.thrift.protocol.TProtocol prot)
     {
       super(prot, prot);
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+    public Client(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
       super(iprot, oprot);
     }
 
-    public void submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_submitTopology(name, uploadedJarLocation, jsonConf, topology);
       recv_submitTopology();
     }
 
-    public void send_submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology) throws org.apache.thrift.TException
+    public void send_submitTopology(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology) throws org.apache.storm.thrift.TException
     {
       submitTopology_args args = new submitTopology_args();
       args.set_name(name);
@@ -317,7 +317,7 @@ public class Nimbus {
       sendBase("submitTopology", args);
     }
 
-    public void recv_submitTopology() throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void recv_submitTopology() throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       submitTopology_result result = new submitTopology_result();
       receiveBase(result, "submitTopology");
@@ -333,13 +333,13 @@ public class Nimbus {
       return;
     }
 
-    public void submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_submitTopologyWithOpts(name, uploadedJarLocation, jsonConf, topology, options);
       recv_submitTopologyWithOpts();
     }
 
-    public void send_submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options) throws org.apache.thrift.TException
+    public void send_submitTopologyWithOpts(java.lang.String name, java.lang.String uploadedJarLocation, java.lang.String jsonConf, StormTopology topology, SubmitOptions options) throws org.apache.storm.thrift.TException
     {
       submitTopologyWithOpts_args args = new submitTopologyWithOpts_args();
       args.set_name(name);
@@ -350,7 +350,7 @@ public class Nimbus {
       sendBase("submitTopologyWithOpts", args);
     }
 
-    public void recv_submitTopologyWithOpts() throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void recv_submitTopologyWithOpts() throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       submitTopologyWithOpts_result result = new submitTopologyWithOpts_result();
       receiveBase(result, "submitTopologyWithOpts");
@@ -366,20 +366,20 @@ public class Nimbus {
       return;
     }
 
-    public void killTopology(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void killTopology(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_killTopology(name);
       recv_killTopology();
     }
 
-    public void send_killTopology(java.lang.String name) throws org.apache.thrift.TException
+    public void send_killTopology(java.lang.String name) throws org.apache.storm.thrift.TException
     {
       killTopology_args args = new killTopology_args();
       args.set_name(name);
       sendBase("killTopology", args);
     }
 
-    public void recv_killTopology() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void recv_killTopology() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       killTopology_result result = new killTopology_result();
       receiveBase(result, "killTopology");
@@ -392,13 +392,13 @@ public class Nimbus {
       return;
     }
 
-    public void killTopologyWithOpts(java.lang.String name, KillOptions options) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void killTopologyWithOpts(java.lang.String name, KillOptions options) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_killTopologyWithOpts(name, options);
       recv_killTopologyWithOpts();
     }
 
-    public void send_killTopologyWithOpts(java.lang.String name, KillOptions options) throws org.apache.thrift.TException
+    public void send_killTopologyWithOpts(java.lang.String name, KillOptions options) throws org.apache.storm.thrift.TException
     {
       killTopologyWithOpts_args args = new killTopologyWithOpts_args();
       args.set_name(name);
@@ -406,7 +406,7 @@ public class Nimbus {
       sendBase("killTopologyWithOpts", args);
     }
 
-    public void recv_killTopologyWithOpts() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void recv_killTopologyWithOpts() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       killTopologyWithOpts_result result = new killTopologyWithOpts_result();
       receiveBase(result, "killTopologyWithOpts");
@@ -419,20 +419,20 @@ public class Nimbus {
       return;
     }
 
-    public void activate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void activate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_activate(name);
       recv_activate();
     }
 
-    public void send_activate(java.lang.String name) throws org.apache.thrift.TException
+    public void send_activate(java.lang.String name) throws org.apache.storm.thrift.TException
     {
       activate_args args = new activate_args();
       args.set_name(name);
       sendBase("activate", args);
     }
 
-    public void recv_activate() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void recv_activate() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       activate_result result = new activate_result();
       receiveBase(result, "activate");
@@ -445,20 +445,20 @@ public class Nimbus {
       return;
     }
 
-    public void deactivate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void deactivate(java.lang.String name) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_deactivate(name);
       recv_deactivate();
     }
 
-    public void send_deactivate(java.lang.String name) throws org.apache.thrift.TException
+    public void send_deactivate(java.lang.String name) throws org.apache.storm.thrift.TException
     {
       deactivate_args args = new deactivate_args();
       args.set_name(name);
       sendBase("deactivate", args);
     }
 
-    public void recv_deactivate() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void recv_deactivate() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       deactivate_result result = new deactivate_result();
       receiveBase(result, "deactivate");
@@ -471,13 +471,13 @@ public class Nimbus {
       return;
     }
 
-    public void rebalance(java.lang.String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void rebalance(java.lang.String name, RebalanceOptions options) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_rebalance(name, options);
       recv_rebalance();
     }
 
-    public void send_rebalance(java.lang.String name, RebalanceOptions options) throws org.apache.thrift.TException
+    public void send_rebalance(java.lang.String name, RebalanceOptions options) throws org.apache.storm.thrift.TException
     {
       rebalance_args args = new rebalance_args();
       args.set_name(name);
@@ -485,7 +485,7 @@ public class Nimbus {
       sendBase("rebalance", args);
     }
 
-    public void recv_rebalance() throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void recv_rebalance() throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       rebalance_result result = new rebalance_result();
       receiveBase(result, "rebalance");
@@ -501,13 +501,13 @@ public class Nimbus {
       return;
     }
 
-    public void setLogConfig(java.lang.String name, LogConfig config) throws org.apache.thrift.TException
+    public void setLogConfig(java.lang.String name, LogConfig config) throws org.apache.storm.thrift.TException
     {
       send_setLogConfig(name, config);
       recv_setLogConfig();
     }
 
-    public void send_setLogConfig(java.lang.String name, LogConfig config) throws org.apache.thrift.TException
+    public void send_setLogConfig(java.lang.String name, LogConfig config) throws org.apache.storm.thrift.TException
     {
       setLogConfig_args args = new setLogConfig_args();
       args.set_name(name);
@@ -515,43 +515,43 @@ public class Nimbus {
       sendBase("setLogConfig", args);
     }
 
-    public void recv_setLogConfig() throws org.apache.thrift.TException
+    public void recv_setLogConfig() throws org.apache.storm.thrift.TException
     {
       setLogConfig_result result = new setLogConfig_result();
       receiveBase(result, "setLogConfig");
       return;
     }
 
-    public LogConfig getLogConfig(java.lang.String name) throws org.apache.thrift.TException
+    public LogConfig getLogConfig(java.lang.String name) throws org.apache.storm.thrift.TException
     {
       send_getLogConfig(name);
       return recv_getLogConfig();
     }
 
-    public void send_getLogConfig(java.lang.String name) throws org.apache.thrift.TException
+    public void send_getLogConfig(java.lang.String name) throws org.apache.storm.thrift.TException
     {
       getLogConfig_args args = new getLogConfig_args();
       args.set_name(name);
       sendBase("getLogConfig", args);
     }
 
-    public LogConfig recv_getLogConfig() throws org.apache.thrift.TException
+    public LogConfig recv_getLogConfig() throws org.apache.storm.thrift.TException
     {
       getLogConfig_result result = new getLogConfig_result();
       receiveBase(result, "getLogConfig");
       if (result.is_set_success()) {
         return result.success;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLogConfig failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getLogConfig failed: unknown result");
     }
 
-    public void debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_debug(name, component, enable, samplingPercentage);
       recv_debug();
     }
 
-    public void send_debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage) throws org.apache.thrift.TException
+    public void send_debug(java.lang.String name, java.lang.String component, boolean enable, double samplingPercentage) throws org.apache.storm.thrift.TException
     {
       debug_args args = new debug_args();
       args.set_name(name);
@@ -561,7 +561,7 @@ public class Nimbus {
       sendBase("debug", args);
     }
 
-    public void recv_debug() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public void recv_debug() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       debug_result result = new debug_result();
       receiveBase(result, "debug");
@@ -574,13 +574,13 @@ public class Nimbus {
       return;
     }
 
-    public void setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest) throws org.apache.thrift.TException
+    public void setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest) throws org.apache.storm.thrift.TException
     {
       send_setWorkerProfiler(id, profileRequest);
       recv_setWorkerProfiler();
     }
 
-    public void send_setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest) throws org.apache.thrift.TException
+    public void send_setWorkerProfiler(java.lang.String id, ProfileRequest profileRequest) throws org.apache.storm.thrift.TException
     {
       setWorkerProfiler_args args = new setWorkerProfiler_args();
       args.set_id(id);
@@ -588,20 +588,20 @@ public class Nimbus {
       sendBase("setWorkerProfiler", args);
     }
 
-    public void recv_setWorkerProfiler() throws org.apache.thrift.TException
+    public void recv_setWorkerProfiler() throws org.apache.storm.thrift.TException
     {
       setWorkerProfiler_result result = new setWorkerProfiler_result();
       receiveBase(result, "setWorkerProfiler");
       return;
     }
 
-    public java.util.List<ProfileRequest> getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action) throws org.apache.thrift.TException
+    public java.util.List<ProfileRequest> getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action) throws org.apache.storm.thrift.TException
     {
       send_getComponentPendingProfileActions(id, component_id, action);
       return recv_getComponentPendingProfileActions();
     }
 
-    public void send_getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action) throws org.apache.thrift.TException
+    public void send_getComponentPendingProfileActions(java.lang.String id, java.lang.String component_id, ProfileAction action) throws org.apache.storm.thrift.TException
     {
       getComponentPendingProfileActions_args args = new getComponentPendingProfileActions_args();
       args.set_id(id);
@@ -610,23 +610,23 @@ public class Nimbus {
       sendBase("getComponentPendingProfileActions", args);
     }
 
-    public java.util.List<ProfileRequest> recv_getComponentPendingProfileActions() throws org.apache.thrift.TException
+    public java.util.List<ProfileRequest> recv_getComponentPendingProfileActions() throws org.apache.storm.thrift.TException
     {
       getComponentPendingProfileActions_result result = new getComponentPendingProfileActions_result();
       receiveBase(result, "getComponentPendingProfileActions");
       if (result.is_set_success()) {
         return result.success;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getComponentPendingProfileActions failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getComponentPendingProfileActions failed: unknown result");
     }
 
-    public void uploadNewCredentials(java.lang.String name, Credentials creds) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void uploadNewCredentials(java.lang.String name, Credentials creds) throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_uploadNewCredentials(name, creds);
       recv_uploadNewCredentials();
     }
 
-    public void send_uploadNewCredentials(java.lang.String name, Credentials creds) throws org.apache.thrift.TException
+    public void send_uploadNewCredentials(java.lang.String name, Credentials creds) throws org.apache.storm.thrift.TException
     {
       uploadNewCredentials_args args = new uploadNewCredentials_args();
       args.set_name(name);
@@ -634,7 +634,7 @@ public class Nimbus {
       sendBase("uploadNewCredentials", args);
     }
 
-    public void recv_uploadNewCredentials() throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.thrift.TException
+    public void recv_uploadNewCredentials() throws NotAliveException, InvalidTopologyException, AuthorizationException, org.apache.storm.thrift.TException
     {
       uploadNewCredentials_result result = new uploadNewCredentials_result();
       receiveBase(result, "uploadNewCredentials");
@@ -650,13 +650,13 @@ public class Nimbus {
       return;
     }
 
-    public java.lang.String beginCreateBlob(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyAlreadyExistsException, org.apache.thrift.TException
+    public java.lang.String beginCreateBlob(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyAlreadyExistsException, org.apache.storm.thrift.TException
     {
       send_beginCreateBlob(key, meta);
       return recv_beginCreateBlob();
     }
 
-    public void send_beginCreateBlob(java.lang.String key, SettableBlobMeta meta) throws org.apache.thrift.TException
+    public void send_beginCreateBlob(java.lang.String key, SettableBlobMeta meta) throws org.apache.storm.thrift.TException
     {
       beginCreateBlob_args args = new beginCreateBlob_args();
       args.set_key(key);
@@ -664,7 +664,7 @@ public class Nimbus {
       sendBase("beginCreateBlob", args);
     }
 
-    public java.lang.String recv_beginCreateBlob() throws AuthorizationException, KeyAlreadyExistsException, org.apache.thrift.TException
+    public java.lang.String recv_beginCreateBlob() throws AuthorizationException, KeyAlreadyExistsException, org.apache.storm.thrift.TException
     {
       beginCreateBlob_result result = new beginCreateBlob_result();
       receiveBase(result, "beginCreateBlob");
@@ -677,23 +677,23 @@ public class Nimbus {
       if (result.kae != null) {
         throw result.kae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginCreateBlob failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "beginCreateBlob failed: unknown result");
     }
 
-    public java.lang.String beginUpdateBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public java.lang.String beginUpdateBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_beginUpdateBlob(key);
       return recv_beginUpdateBlob();
     }
 
-    public void send_beginUpdateBlob(java.lang.String key) throws org.apache.thrift.TException
+    public void send_beginUpdateBlob(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       beginUpdateBlob_args args = new beginUpdateBlob_args();
       args.set_key(key);
       sendBase("beginUpdateBlob", args);
     }
 
-    public java.lang.String recv_beginUpdateBlob() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public java.lang.String recv_beginUpdateBlob() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       beginUpdateBlob_result result = new beginUpdateBlob_result();
       receiveBase(result, "beginUpdateBlob");
@@ -706,16 +706,16 @@ public class Nimbus {
       if (result.knf != null) {
         throw result.knf;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginUpdateBlob failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "beginUpdateBlob failed: unknown result");
     }
 
-    public void uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.thrift.TException
+    public void uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_uploadBlobChunk(session, chunk);
       recv_uploadBlobChunk();
     }
 
-    public void send_uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk) throws org.apache.thrift.TException
+    public void send_uploadBlobChunk(java.lang.String session, java.nio.ByteBuffer chunk) throws org.apache.storm.thrift.TException
     {
       uploadBlobChunk_args args = new uploadBlobChunk_args();
       args.set_session(session);
@@ -723,7 +723,7 @@ public class Nimbus {
       sendBase("uploadBlobChunk", args);
     }
 
-    public void recv_uploadBlobChunk() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_uploadBlobChunk() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       uploadBlobChunk_result result = new uploadBlobChunk_result();
       receiveBase(result, "uploadBlobChunk");
@@ -733,20 +733,20 @@ public class Nimbus {
       return;
     }
 
-    public void finishBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.thrift.TException
+    public void finishBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_finishBlobUpload(session);
       recv_finishBlobUpload();
     }
 
-    public void send_finishBlobUpload(java.lang.String session) throws org.apache.thrift.TException
+    public void send_finishBlobUpload(java.lang.String session) throws org.apache.storm.thrift.TException
     {
       finishBlobUpload_args args = new finishBlobUpload_args();
       args.set_session(session);
       sendBase("finishBlobUpload", args);
     }
 
-    public void recv_finishBlobUpload() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_finishBlobUpload() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       finishBlobUpload_result result = new finishBlobUpload_result();
       receiveBase(result, "finishBlobUpload");
@@ -756,20 +756,20 @@ public class Nimbus {
       return;
     }
 
-    public void cancelBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.thrift.TException
+    public void cancelBlobUpload(java.lang.String session) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_cancelBlobUpload(session);
       recv_cancelBlobUpload();
     }
 
-    public void send_cancelBlobUpload(java.lang.String session) throws org.apache.thrift.TException
+    public void send_cancelBlobUpload(java.lang.String session) throws org.apache.storm.thrift.TException
     {
       cancelBlobUpload_args args = new cancelBlobUpload_args();
       args.set_session(session);
       sendBase("cancelBlobUpload", args);
     }
 
-    public void recv_cancelBlobUpload() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_cancelBlobUpload() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       cancelBlobUpload_result result = new cancelBlobUpload_result();
       receiveBase(result, "cancelBlobUpload");
@@ -779,20 +779,20 @@ public class Nimbus {
       return;
     }
 
-    public ReadableBlobMeta getBlobMeta(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public ReadableBlobMeta getBlobMeta(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_getBlobMeta(key);
       return recv_getBlobMeta();
     }
 
-    public void send_getBlobMeta(java.lang.String key) throws org.apache.thrift.TException
+    public void send_getBlobMeta(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       getBlobMeta_args args = new getBlobMeta_args();
       args.set_key(key);
       sendBase("getBlobMeta", args);
     }
 
-    public ReadableBlobMeta recv_getBlobMeta() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public ReadableBlobMeta recv_getBlobMeta() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       getBlobMeta_result result = new getBlobMeta_result();
       receiveBase(result, "getBlobMeta");
@@ -805,16 +805,16 @@ public class Nimbus {
       if (result.knf != null) {
         throw result.knf;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getBlobMeta failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getBlobMeta failed: unknown result");
     }
 
-    public void setBlobMeta(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public void setBlobMeta(java.lang.String key, SettableBlobMeta meta) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_setBlobMeta(key, meta);
       recv_setBlobMeta();
     }
 
-    public void send_setBlobMeta(java.lang.String key, SettableBlobMeta meta) throws org.apache.thrift.TException
+    public void send_setBlobMeta(java.lang.String key, SettableBlobMeta meta) throws org.apache.storm.thrift.TException
     {
       setBlobMeta_args args = new setBlobMeta_args();
       args.set_key(key);
@@ -822,7 +822,7 @@ public class Nimbus {
       sendBase("setBlobMeta", args);
     }
 
-    public void recv_setBlobMeta() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public void recv_setBlobMeta() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       setBlobMeta_result result = new setBlobMeta_result();
       receiveBase(result, "setBlobMeta");
@@ -835,20 +835,20 @@ public class Nimbus {
       return;
     }
 
-    public BeginDownloadResult beginBlobDownload(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public BeginDownloadResult beginBlobDownload(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_beginBlobDownload(key);
       return recv_beginBlobDownload();
     }
 
-    public void send_beginBlobDownload(java.lang.String key) throws org.apache.thrift.TException
+    public void send_beginBlobDownload(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       beginBlobDownload_args args = new beginBlobDownload_args();
       args.set_key(key);
       sendBase("beginBlobDownload", args);
     }
 
-    public BeginDownloadResult recv_beginBlobDownload() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public BeginDownloadResult recv_beginBlobDownload() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       beginBlobDownload_result result = new beginBlobDownload_result();
       receiveBase(result, "beginBlobDownload");
@@ -861,23 +861,23 @@ public class Nimbus {
       if (result.knf != null) {
         throw result.knf;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginBlobDownload failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "beginBlobDownload failed: unknown result");
     }
 
-    public java.nio.ByteBuffer downloadBlobChunk(java.lang.String session) throws AuthorizationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer downloadBlobChunk(java.lang.String session) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_downloadBlobChunk(session);
       return recv_downloadBlobChunk();
     }
 
-    public void send_downloadBlobChunk(java.lang.String session) throws org.apache.thrift.TException
+    public void send_downloadBlobChunk(java.lang.String session) throws org.apache.storm.thrift.TException
     {
       downloadBlobChunk_args args = new downloadBlobChunk_args();
       args.set_session(session);
       sendBase("downloadBlobChunk", args);
     }
 
-    public java.nio.ByteBuffer recv_downloadBlobChunk() throws AuthorizationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer recv_downloadBlobChunk() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       downloadBlobChunk_result result = new downloadBlobChunk_result();
       receiveBase(result, "downloadBlobChunk");
@@ -887,23 +887,23 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "downloadBlobChunk failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "downloadBlobChunk failed: unknown result");
     }
 
-    public void deleteBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public void deleteBlob(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_deleteBlob(key);
       recv_deleteBlob();
     }
 
-    public void send_deleteBlob(java.lang.String key) throws org.apache.thrift.TException
+    public void send_deleteBlob(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       deleteBlob_args args = new deleteBlob_args();
       args.set_key(key);
       sendBase("deleteBlob", args);
     }
 
-    public void recv_deleteBlob() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public void recv_deleteBlob() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       deleteBlob_result result = new deleteBlob_result();
       receiveBase(result, "deleteBlob");
@@ -916,43 +916,43 @@ public class Nimbus {
       return;
     }
 
-    public ListBlobsResult listBlobs(java.lang.String session) throws org.apache.thrift.TException
+    public ListBlobsResult listBlobs(java.lang.String session) throws org.apache.storm.thrift.TException
     {
       send_listBlobs(session);
       return recv_listBlobs();
     }
 
-    public void send_listBlobs(java.lang.String session) throws org.apache.thrift.TException
+    public void send_listBlobs(java.lang.String session) throws org.apache.storm.thrift.TException
     {
       listBlobs_args args = new listBlobs_args();
       args.set_session(session);
       sendBase("listBlobs", args);
     }
 
-    public ListBlobsResult recv_listBlobs() throws org.apache.thrift.TException
+    public ListBlobsResult recv_listBlobs() throws org.apache.storm.thrift.TException
     {
       listBlobs_result result = new listBlobs_result();
       receiveBase(result, "listBlobs");
       if (result.is_set_success()) {
         return result.success;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listBlobs failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "listBlobs failed: unknown result");
     }
 
-    public int getBlobReplication(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public int getBlobReplication(java.lang.String key) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_getBlobReplication(key);
       return recv_getBlobReplication();
     }
 
-    public void send_getBlobReplication(java.lang.String key) throws org.apache.thrift.TException
+    public void send_getBlobReplication(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       getBlobReplication_args args = new getBlobReplication_args();
       args.set_key(key);
       sendBase("getBlobReplication", args);
     }
 
-    public int recv_getBlobReplication() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public int recv_getBlobReplication() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       getBlobReplication_result result = new getBlobReplication_result();
       receiveBase(result, "getBlobReplication");
@@ -965,16 +965,16 @@ public class Nimbus {
       if (result.knf != null) {
         throw result.knf;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getBlobReplication failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getBlobReplication failed: unknown result");
     }
 
-    public int updateBlobReplication(java.lang.String key, int replication) throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public int updateBlobReplication(java.lang.String key, int replication) throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       send_updateBlobReplication(key, replication);
       return recv_updateBlobReplication();
     }
 
-    public void send_updateBlobReplication(java.lang.String key, int replication) throws org.apache.thrift.TException
+    public void send_updateBlobReplication(java.lang.String key, int replication) throws org.apache.storm.thrift.TException
     {
       updateBlobReplication_args args = new updateBlobReplication_args();
       args.set_key(key);
@@ -982,7 +982,7 @@ public class Nimbus {
       sendBase("updateBlobReplication", args);
     }
 
-    public int recv_updateBlobReplication() throws AuthorizationException, KeyNotFoundException, org.apache.thrift.TException
+    public int recv_updateBlobReplication() throws AuthorizationException, KeyNotFoundException, org.apache.storm.thrift.TException
     {
       updateBlobReplication_result result = new updateBlobReplication_result();
       receiveBase(result, "updateBlobReplication");
@@ -995,42 +995,42 @@ public class Nimbus {
       if (result.knf != null) {
         throw result.knf;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateBlobReplication failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "updateBlobReplication failed: unknown result");
     }
 
-    public void createStateInZookeeper(java.lang.String key) throws org.apache.thrift.TException
+    public void createStateInZookeeper(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       send_createStateInZookeeper(key);
       recv_createStateInZookeeper();
     }
 
-    public void send_createStateInZookeeper(java.lang.String key) throws org.apache.thrift.TException
+    public void send_createStateInZookeeper(java.lang.String key) throws org.apache.storm.thrift.TException
     {
       createStateInZookeeper_args args = new createStateInZookeeper_args();
       args.set_key(key);
       sendBase("createStateInZookeeper", args);
     }
 
-    public void recv_createStateInZookeeper() throws org.apache.thrift.TException
+    public void recv_createStateInZookeeper() throws org.apache.storm.thrift.TException
     {
       createStateInZookeeper_result result = new createStateInZookeeper_result();
       receiveBase(result, "createStateInZookeeper");
       return;
     }
 
-    public java.lang.String beginFileUpload() throws AuthorizationException, org.apache.thrift.TException
+    public java.lang.String beginFileUpload() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_beginFileUpload();
       return recv_beginFileUpload();
     }
 
-    public void send_beginFileUpload() throws org.apache.thrift.TException
+    public void send_beginFileUpload() throws org.apache.storm.thrift.TException
     {
       beginFileUpload_args args = new beginFileUpload_args();
       sendBase("beginFileUpload", args);
     }
 
-    public java.lang.String recv_beginFileUpload() throws AuthorizationException, org.apache.thrift.TException
+    public java.lang.String recv_beginFileUpload() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       beginFileUpload_result result = new beginFileUpload_result();
       receiveBase(result, "beginFileUpload");
@@ -1040,16 +1040,16 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginFileUpload failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "beginFileUpload failed: unknown result");
     }
 
-    public void uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.thrift.TException
+    public void uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_uploadChunk(location, chunk);
       recv_uploadChunk();
     }
 
-    public void send_uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk) throws org.apache.thrift.TException
+    public void send_uploadChunk(java.lang.String location, java.nio.ByteBuffer chunk) throws org.apache.storm.thrift.TException
     {
       uploadChunk_args args = new uploadChunk_args();
       args.set_location(location);
@@ -1057,7 +1057,7 @@ public class Nimbus {
       sendBase("uploadChunk", args);
     }
 
-    public void recv_uploadChunk() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_uploadChunk() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       uploadChunk_result result = new uploadChunk_result();
       receiveBase(result, "uploadChunk");
@@ -1067,20 +1067,20 @@ public class Nimbus {
       return;
     }
 
-    public void finishFileUpload(java.lang.String location) throws AuthorizationException, org.apache.thrift.TException
+    public void finishFileUpload(java.lang.String location) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_finishFileUpload(location);
       recv_finishFileUpload();
     }
 
-    public void send_finishFileUpload(java.lang.String location) throws org.apache.thrift.TException
+    public void send_finishFileUpload(java.lang.String location) throws org.apache.storm.thrift.TException
     {
       finishFileUpload_args args = new finishFileUpload_args();
       args.set_location(location);
       sendBase("finishFileUpload", args);
     }
 
-    public void recv_finishFileUpload() throws AuthorizationException, org.apache.thrift.TException
+    public void recv_finishFileUpload() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       finishFileUpload_result result = new finishFileUpload_result();
       receiveBase(result, "finishFileUpload");
@@ -1090,20 +1090,20 @@ public class Nimbus {
       return;
     }
 
-    public java.lang.String beginFileDownload(java.lang.String file) throws AuthorizationException, org.apache.thrift.TException
+    public java.lang.String beginFileDownload(java.lang.String file) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_beginFileDownload(file);
       return recv_beginFileDownload();
     }
 
-    public void send_beginFileDownload(java.lang.String file) throws org.apache.thrift.TException
+    public void send_beginFileDownload(java.lang.String file) throws org.apache.storm.thrift.TException
     {
       beginFileDownload_args args = new beginFileDownload_args();
       args.set_file(file);
       sendBase("beginFileDownload", args);
     }
 
-    public java.lang.String recv_beginFileDownload() throws AuthorizationException, org.apache.thrift.TException
+    public java.lang.String recv_beginFileDownload() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       beginFileDownload_result result = new beginFileDownload_result();
       receiveBase(result, "beginFileDownload");
@@ -1113,23 +1113,23 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "beginFileDownload failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "beginFileDownload failed: unknown result");
     }
 
-    public java.nio.ByteBuffer downloadChunk(java.lang.String id) throws AuthorizationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer downloadChunk(java.lang.String id) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_downloadChunk(id);
       return recv_downloadChunk();
     }
 
-    public void send_downloadChunk(java.lang.String id) throws org.apache.thrift.TException
+    public void send_downloadChunk(java.lang.String id) throws org.apache.storm.thrift.TException
     {
       downloadChunk_args args = new downloadChunk_args();
       args.set_id(id);
       sendBase("downloadChunk", args);
     }
 
-    public java.nio.ByteBuffer recv_downloadChunk() throws AuthorizationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer recv_downloadChunk() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       downloadChunk_result result = new downloadChunk_result();
       receiveBase(result, "downloadChunk");
@@ -1139,22 +1139,22 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result");
     }
 
-    public java.lang.String getNimbusConf() throws AuthorizationException, org.apache.thrift.TException
+    public java.lang.String getNimbusConf() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_getNimbusConf();
       return recv_getNimbusConf();
     }
 
-    public void send_getNimbusConf() throws org.apache.thrift.TException
+    public void send_getNimbusConf() throws org.apache.storm.thrift.TException
     {
       getNimbusConf_args args = new getNimbusConf_args();
       sendBase("getNimbusConf", args);
     }
 
-    public java.lang.String recv_getNimbusConf() throws AuthorizationException, org.apache.thrift.TException
+    public java.lang.String recv_getNimbusConf() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       getNimbusConf_result result = new getNimbusConf_result();
       receiveBase(result, "getNimbusConf");
@@ -1164,22 +1164,22 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result");
     }
 
-    public ClusterSummary getClusterInfo() throws AuthorizationException, org.apache.thrift.TException
+    public ClusterSummary getClusterInfo() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_getClusterInfo();
       return recv_getClusterInfo();
     }
 
-    public void send_getClusterInfo() throws org.apache.thrift.TException
+    public void send_getClusterInfo() throws org.apache.storm.thrift.TException
     {
       getClusterInfo_args args = new getClusterInfo_args();
       sendBase("getClusterInfo", args);
     }
 
-    public ClusterSummary recv_getClusterInfo() throws AuthorizationException, org.apache.thrift.TException
+    public ClusterSummary recv_getClusterInfo() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       getClusterInfo_result result = new getClusterInfo_result();
       receiveBase(result, "getClusterInfo");
@@ -1189,22 +1189,22 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getClusterInfo failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getClusterInfo failed: unknown result");
     }
 
-    public NimbusSummary getLeader() throws AuthorizationException, org.apache.thrift.TException
+    public NimbusSummary getLeader() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_getLeader();
       return recv_getLeader();
     }
 
-    public void send_getLeader() throws org.apache.thrift.TException
+    public void send_getLeader() throws org.apache.storm.thrift.TException
     {
       getLeader_args args = new getLeader_args();
       sendBase("getLeader", args);
     }
 
-    public NimbusSummary recv_getLeader() throws AuthorizationException, org.apache.thrift.TException
+    public NimbusSummary recv_getLeader() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       getLeader_result result = new getLeader_result();
       receiveBase(result, "getLeader");
@@ -1214,23 +1214,23 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLeader failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getLeader failed: unknown result");
     }
 
-    public boolean isTopologyNameAllowed(java.lang.String name) throws AuthorizationException, org.apache.thrift.TException
+    public boolean isTopologyNameAllowed(java.lang.String name) throws AuthorizationException, org.apache.storm.thrift.TException
     {
       send_isTopologyNameAllowed(name);
       return recv_isTopologyNameAllowed();
     }
 
-    public void send_isTopologyNameAllowed(java.lang.String name) throws org.apache.thrift.TException
+    public void send_isTopologyNameAllowed(java.lang.String name) throws org.apache.storm.thrift.TException
     {
       isTopologyNameAllowed_args args = new isTopologyNameAllowed_args();
       args.set_name(name);
       sendBase("isTopologyNameAllowed", args);
     }
 
-    public boolean recv_isTopologyNameAllowed() throws AuthorizationException, org.apache.thrift.TException
+    public boolean recv_isTopologyNameAllowed() throws AuthorizationException, org.apache.storm.thrift.TException
     {
       isTopologyNameAllowed_result result = new isTopologyNameAllowed_result();
       receiveBase(result, "isTopologyNameAllowed");
@@ -1240,23 +1240,23 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isTopologyNameAllowed failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "isTopologyNameAllowed failed: unknown result");
     }
 
-    public TopologyInfo getTopologyInfo(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public TopologyInfo getTopologyInfo(java.lang.String id) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_getTopologyInfo(id);
       return recv_getTopologyInfo();
     }
 
-    public void send_getTopologyInfo(java.lang.String id) throws org.apache.thrift.TException
+    public void send_getTopologyInfo(java.lang.String id) throws org.apache.storm.thrift.TException
     {
       getTopologyInfo_args args = new getTopologyInfo_args();
       args.set_id(id);
       sendBase("getTopologyInfo", args);
     }
 
-    public TopologyInfo recv_getTopologyInfo() throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public TopologyInfo recv_getTopologyInfo() throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       getTopologyInfo_result result = new getTopologyInfo_result();
       receiveBase(result, "getTopologyInfo");
@@ -1269,16 +1269,16 @@ public class Nimbus {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result");
     }
 
-    public TopologyInfo getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options) throws NotAliveException, AuthorizationException, org.apache.thrift.TException
+    public TopologyInfo getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options) throws NotAliveException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_getTopologyInfoWithOpts(id, options);
       return recv_getTopologyInfoWithOpts();
     }
 
-    public void send_getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options) throws org.apache.thrift.TException
+    public void send_getTopologyInfoWithOpts(java.lang.String id, GetInfoOptions options) throws org.apache.storm.thrift.TException
     {
       getTopologyInfoWithOpts_args args = new getTopologyInfoWithOpts_args();
       args.set_id(id);
@@ -1286,7 +1286,7 @@ public class Nimbus {
       sendBase("getTopologyInfoWithOpts", args);
     }
 
-    public TopologyInfo recv_get

<TRUNCATED>

[02/50] [abbrv] storm git commit: STORM-2882: Shaded zookeeper

Posted by bo...@apache.org.
STORM-2882: Shaded zookeeper


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

Branch: refs/heads/master
Commit: 9b83b46d55acdf20f62cfec15800d1898f0efe19
Parents: 8a95784
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 16 09:51:47 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:12 2018 -0500

----------------------------------------------------------------------
 shaded-deps/pom.xml                             | 17 ++++-
 storm-client/pom.xml                            |  6 --
 .../storm/callback/DefaultWatcherCallBack.java  |  2 +-
 .../apache/storm/callback/WatcherCallBack.java  |  4 +-
 .../storm/callback/ZKStateChangedCallback.java  |  2 +-
 .../storm/cluster/ClusterStateContext.java      |  2 +-
 .../org/apache/storm/cluster/ClusterUtils.java  |  8 +-
 .../org/apache/storm/cluster/DaemonType.java    |  4 +-
 .../org/apache/storm/cluster/IStateStorage.java |  2 +-
 .../storm/cluster/PaceMakerStateStorage.java    |  2 +-
 .../storm/cluster/StormClusterStateImpl.java    |  6 +-
 .../apache/storm/cluster/ZKStateStorage.java    |  8 +-
 .../netty/KerberosSaslNettyServer.java          |  2 +-
 .../org/apache/storm/messaging/netty/Login.java |  4 +-
 .../kerberos/KerberosSaslTransportPlugin.java   |  2 +-
 .../state/TestTransactionalState.java           |  4 +-
 .../transactional/state/TransactionalState.java |  6 +-
 .../state/RotatingTransactionalState.java       |  2 +-
 .../topology/state/TestTransactionalState.java  |  4 +-
 .../topology/state/TransactionalState.java      |  6 +-
 .../org/apache/storm/utils/CuratorUtils.java    |  2 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |  6 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java | 77 --------------------
 .../apache/storm/zookeeper/ClientZookeeper.java | 15 ++--
 .../apache/storm/zookeeper/ZkEventTypes.java    |  2 +-
 .../apache/storm/zookeeper/ZkKeeperStates.java  |  2 +-
 .../apache/storm/cluster/DaemonTypeTest.java    |  6 +-
 .../utils/ZookeeperServerCnxnFactoryTest.java   | 34 ---------
 storm-core/pom.xml                              |  4 -
 .../test/clj/org/apache/storm/cluster_test.clj  |  2 +-
 storm-server/pom.xml                            |  5 --
 .../apache/storm/blobstore/BlobStoreUtils.java  |  5 +-
 .../storm/blobstore/KeySequenceNumber.java      |  6 +-
 .../storm/blobstore/LocalFsBlobStore.java       |  4 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |  7 +-
 .../storm/nimbus/LeaderListenerCallback.java    |  4 +-
 .../storm/testing/InProcessZookeeper.java       |  5 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java | 77 ++++++++++++++++++++
 .../apache/storm/zookeeper/AclEnforcement.java  | 10 +--
 .../storm/zookeeper/LeaderElectorImp.java       |  2 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   |  6 +-
 .../blobstore/MockZookeeperClientBuilder.java   |  2 +-
 .../utils/ZookeeperServerCnxnFactoryTest.java   | 33 +++++++++
 43 files changed, 201 insertions(+), 208 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index f60b524..7977cb1 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
-	    <artifactId>guava</artifactId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
@@ -49,12 +49,16 @@
             <artifactId>curator-client</artifactId>
         </dependency>
         <!-- recipes are not used by the client, but storm server uses the same
-	     shaded curator instance so we need to include it here so we have a
+             shaded curator instance so we need to include it here so we have a
              single ZK connection per daemon. -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,8 +81,9 @@
                     <minimizeJar>false</minimizeJar>
                     <artifactSet>
                         <includes>
-				<include>com.google.guava:guava</include>
-				<include>org.apache.curator:*</include>
+                                <include>com.google.guava:guava</include>
+                                <include>org.apache.curator:*</include>
+                                <include>org.apache.zookeeper:zookeeper</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -94,6 +99,10 @@
                             <pattern>org.apache.curator</pattern>
                             <shadedPattern>org.apache.storm.shade.org.apache.curator</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.apache.zookeeper</pattern>
+                            <shadedPattern>org.apache.storm.shade.org.apache.zookeeper</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 59a7e36..37ad5c7 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -146,12 +146,6 @@
             <artifactId>kryo</artifactId>
         </dependency>
 
-        <!-- zookeeper -->
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-        </dependency>
-
         <!-- jgrapht -->
         <dependency>
             <groupId>org.jgrapht</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/callback/DefaultWatcherCallBack.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/callback/DefaultWatcherCallBack.java b/storm-client/src/jvm/org/apache/storm/callback/DefaultWatcherCallBack.java
index 8da94fe..1b16fed 100644
--- a/storm-client/src/jvm/org/apache/storm/callback/DefaultWatcherCallBack.java
+++ b/storm-client/src/jvm/org/apache/storm/callback/DefaultWatcherCallBack.java
@@ -12,9 +12,9 @@
 
 package org.apache.storm.callback;
 
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
 import org.apache.storm.zookeeper.ZkEventTypes;
 import org.apache.storm.zookeeper.ZkKeeperStates;
-import org.apache.zookeeper.Watcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/callback/WatcherCallBack.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/callback/WatcherCallBack.java b/storm-client/src/jvm/org/apache/storm/callback/WatcherCallBack.java
index 22b6fc4..f6b548a 100644
--- a/storm-client/src/jvm/org/apache/storm/callback/WatcherCallBack.java
+++ b/storm-client/src/jvm/org/apache/storm/callback/WatcherCallBack.java
@@ -12,8 +12,8 @@
 
 package org.apache.storm.callback;
 
-import org.apache.zookeeper.Watcher;
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
 
 public interface WatcherCallBack {
-    public void execute(Watcher.Event.KeeperState state, Watcher.Event.EventType type, String path);
+    void execute(Watcher.Event.KeeperState state, Watcher.Event.EventType type, String path);
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java b/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
index 6d2ecc9..08672fa 100644
--- a/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
@@ -12,7 +12,7 @@
 
 package org.apache.storm.callback;
 
-import org.apache.zookeeper.Watcher;
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
 
 public interface ZKStateChangedCallback {
     public void changed(Watcher.Event.EventType type, String path);

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/ClusterStateContext.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/ClusterStateContext.java b/storm-client/src/jvm/org/apache/storm/cluster/ClusterStateContext.java
index 753f1f6..9f5f8c6 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/ClusterStateContext.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/ClusterStateContext.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.storm.generated.WorkerTokenServiceType;
-import org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 
 /**
  * This class is intended to provide runtime-context to StateStorageFactory implementors, giving information such as what daemon is creating

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java b/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
index 8141e5f..28d5afb 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
@@ -29,11 +29,11 @@ import org.apache.storm.generated.ExecutorInfo;
 import org.apache.storm.generated.ExecutorStats;
 import org.apache.storm.generated.ProfileAction;
 import org.apache.storm.generated.WorkerTokenServiceType;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.Id;
+import org.apache.storm.shade.org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 import org.apache.storm.utils.Utils;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Id;
-import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 
 public class ClusterUtils {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java b/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java
index f33f1e8..27df05b 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java
@@ -18,9 +18,9 @@ import java.util.Map;
 import org.apache.storm.Config;
 import org.apache.storm.generated.WorkerTokenServiceType;
 import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.Utils;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
index b73ba4e..0889a26 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
@@ -15,7 +15,7 @@ package org.apache.storm.cluster;
 import java.util.List;
 import org.apache.storm.callback.ZKStateChangedCallback;
 import org.apache.storm.shade.org.apache.curator.framework.state.ConnectionStateListener;
-import org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 
 /**
  * StateStorage provides the API for the pluggable state store used by the Storm daemons. Data is stored in path/value format, and the store

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
index 308c756..277a150 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
@@ -31,9 +31,9 @@ import org.apache.storm.generated.HBServerMessageType;
 import org.apache.storm.pacemaker.PacemakerClientPool;
 import org.apache.storm.pacemaker.PacemakerConnectionException;
 import org.apache.storm.shade.org.apache.curator.framework.state.ConnectionStateListener;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.WrappedHBExecutionException;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java b/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
index 9390a9b..93dbdb7 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
@@ -43,11 +43,11 @@ import org.apache.storm.generated.SupervisorInfo;
 import org.apache.storm.generated.WorkerTokenServiceType;
 import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.shade.org.apache.curator.framework.state.ConnectionState;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.Time;
 import org.apache.storm.utils.Utils;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
index eac64e9..2477f34 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
@@ -29,12 +29,12 @@ import org.apache.storm.callback.WatcherCallBack;
 import org.apache.storm.callback.ZKStateChangedCallback;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.state.ConnectionStateListener;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.zookeeper.ClientZookeeper;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
index 38e899e..3321e8f 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
@@ -33,7 +33,7 @@ import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 import org.apache.storm.security.auth.ClientAuthUtils;
 import org.apache.storm.security.auth.KerberosPrincipalToLocal;
-import org.apache.zookeeper.server.auth.KerberosName;
+import org.apache.storm.shade.org.apache.zookeeper.server.auth.KerberosName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java
index 7eeb275..1530d37 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java
@@ -31,8 +31,8 @@ import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 import org.apache.log4j.Logger;
-import org.apache.zookeeper.Shell;
-import org.apache.zookeeper.client.ZooKeeperSaslClient;
+import org.apache.storm.shade.org.apache.zookeeper.Shell;
+import org.apache.storm.shade.org.apache.zookeeper.client.ZooKeeperSaslClient;
 
 public class Login {
     // Login will sleep until 80% of time from last refresh to

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index 07602fa..a5c5c6b 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -35,12 +35,12 @@ import org.apache.storm.security.auth.sasl.SaslTransportPlugin;
 import org.apache.storm.security.auth.sasl.SimpleSaslServerCallbackHandler;
 import org.apache.storm.security.auth.workertoken.WorkerTokenAuthorizer;
 import org.apache.storm.security.auth.workertoken.WorkerTokenClientCallbackHandler;
+import org.apache.storm.shade.org.apache.zookeeper.server.auth.KerberosName;
 import org.apache.thrift.transport.TSaslClientTransport;
 import org.apache.thrift.transport.TSaslServerTransport;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.thrift.transport.TTransportFactory;
-import org.apache.zookeeper.server.auth.KerberosName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java b/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
index f3f1774..af0bbf5 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
@@ -15,8 +15,8 @@ package org.apache.storm.transactional.state;
 import java.util.List;
 import java.util.Map;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 
 /**
  * Facilitates testing of non-public methods in the parent class.

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java b/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java
index 02d4a9c..4ebbc66 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java
@@ -23,12 +23,12 @@ import org.apache.storm.serialization.KryoValuesSerializer;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.api.PathAndBytesable;
 import org.apache.storm.shade.org.apache.curator.framework.api.ProtectACLCreateModePathAndBytesable;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.CuratorUtils;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.ZookeeperAuthInfo;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
index 89eeda9..81db7fa 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
@@ -16,8 +16,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
 import org.apache.storm.utils.Utils;
-import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
index 84f7a3d..ebcabaa 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
@@ -15,8 +15,8 @@ package org.apache.storm.trident.topology.state;
 import java.util.List;
 import java.util.Map;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 
 /**
  * Facilitates testing of non-public methods in the parent class.

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
index 5fec886..b86f82b 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
@@ -23,12 +23,12 @@ import org.apache.storm.cluster.DaemonType;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.api.PathAndBytesable;
 import org.apache.storm.shade.org.apache.curator.framework.api.ProtectACLCreateModePathAndBytesable;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.CuratorUtils;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.ZookeeperAuthInfo;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.data.ACL;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java b/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
index bb9c2da..a187b0a 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
@@ -29,7 +29,7 @@ import org.apache.storm.shade.org.apache.curator.ensemble.exhibitor.Exhibitors;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.storm.shade.org.apache.curator.framework.api.ACLProvider;
-import org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 2dc66f2..051df17 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -89,13 +89,13 @@ import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting;
 import org.apache.storm.shade.com.google.common.collect.Lists;
 import org.apache.storm.shade.com.google.common.collect.MapDifference;
 import org.apache.storm.shade.com.google.common.collect.Maps;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.Id;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TDeserializer;
 import org.apache.thrift.TException;
 import org.apache.thrift.TSerializer;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Id;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactory.java b/storm-client/src/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
deleted file mode 100644
index 565def7f..0000000
--- a/storm-client/src/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version
- * 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
-
-package org.apache.storm.utils;
-
-import java.io.IOException;
-import java.net.BindException;
-import java.net.InetSocketAddress;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ZookeeperServerCnxnFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(ZookeeperServerCnxnFactory.class);
-    int _port;
-    NIOServerCnxnFactory _factory;
-
-    public ZookeeperServerCnxnFactory(int port, int maxClientCnxns) {
-        //port range
-        int max;
-        if (port <= 0) {
-            _port = 2000;
-            max = 65535;
-        } else {
-            _port = port;
-            max = port;
-        }
-
-        try {
-            _factory = new NIOServerCnxnFactory();
-        } catch (IOException e) {
-            _port = 0;
-            _factory = null;
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
-        }
-
-        //look for available port
-        for (; _port <= max; _port++) {
-            try {
-                _factory.configure(new InetSocketAddress(_port), maxClientCnxns);
-                LOG.debug("Zookeeper server successfully binded at port " + _port);
-                break;
-            } catch (BindException e1) {
-            } catch (IOException e2) {
-                _port = 0;
-                _factory = null;
-                e2.printStackTrace();
-                throw new RuntimeException(e2.getMessage());
-            }
-        }
-
-        if (_port > max) {
-            _port = 0;
-            _factory = null;
-            LOG.error("Failed to find a port for Zookeeper");
-            throw new RuntimeException("No port is available to launch an inprocess zookeeper.");
-        }
-    }
-
-    public int port() {
-        return _port;
-    }
-
-    public NIOServerCnxnFactory factory() {
-        return _factory;
-    }
-}

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java b/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java
index bbf6e24..382b2da 100644
--- a/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java
+++ b/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java
@@ -29,13 +29,14 @@ import org.apache.storm.shade.org.apache.curator.framework.api.CuratorEvent;
 import org.apache.storm.shade.org.apache.curator.framework.api.CuratorEventType;
 import org.apache.storm.shade.org.apache.curator.framework.api.CuratorListener;
 import org.apache.storm.shade.org.apache.curator.framework.state.ConnectionStateListener;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.WatchedEvent;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.Stat;
 import org.apache.storm.utils.CuratorUtils;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.ZookeeperAuthInfo;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -90,7 +91,7 @@ public class ClientZookeeper {
         }
     }
 
-    public static String createNode(CuratorFramework zk, String path, byte[] data, org.apache.zookeeper.CreateMode mode, List<ACL> acls) {
+    public static String createNode(CuratorFramework zk, String path, byte[] data, CreateMode mode, List<ACL> acls) {
         String ret = null;
         try {
             String npath = normalizePath(path);
@@ -102,7 +103,7 @@ public class ClientZookeeper {
     }
 
     public static String createNode(CuratorFramework zk, String path, byte[] data, List<ACL> acls) {
-        return createNode(zk, path, data, org.apache.zookeeper.CreateMode.PERSISTENT, acls);
+        return createNode(zk, path, data, CreateMode.PERSISTENT, acls);
     }
 
     public static List<String> tokenizePath(String path) {
@@ -290,7 +291,7 @@ public class ClientZookeeper {
         byte[] byteArray = new byte[1];
         byteArray[0] = (byte) 7;
         try {
-            ClientZookeeper.createNode(zk, npath, byteArray, org.apache.zookeeper.CreateMode.PERSISTENT, acls);
+            ClientZookeeper.createNode(zk, npath, byteArray, CreateMode.PERSISTENT, acls);
         } catch (Exception e) {
             if (Utils.exceptionCauseIsInstanceOf(KeeperException.NodeExistsException.class, e)) {
                 // this can happen when multiple clients doing mkdir at same time

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/zookeeper/ZkEventTypes.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/zookeeper/ZkEventTypes.java b/storm-client/src/jvm/org/apache/storm/zookeeper/ZkEventTypes.java
index d2ba17b..1ec6d2d 100644
--- a/storm-client/src/jvm/org/apache/storm/zookeeper/ZkEventTypes.java
+++ b/storm-client/src/jvm/org/apache/storm/zookeeper/ZkEventTypes.java
@@ -13,7 +13,7 @@
 package org.apache.storm.zookeeper;
 
 import java.util.HashMap;
-import org.apache.zookeeper.Watcher;
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
 
 public class ZkEventTypes {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/src/jvm/org/apache/storm/zookeeper/ZkKeeperStates.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/zookeeper/ZkKeeperStates.java b/storm-client/src/jvm/org/apache/storm/zookeeper/ZkKeeperStates.java
index 8f7b4c0..48b0ea1 100644
--- a/storm-client/src/jvm/org/apache/storm/zookeeper/ZkKeeperStates.java
+++ b/storm-client/src/jvm/org/apache/storm/zookeeper/ZkKeeperStates.java
@@ -13,7 +13,7 @@
 package org.apache.storm.zookeeper;
 
 import java.util.HashMap;
-import org.apache.zookeeper.Watcher;
+import org.apache.storm.shade.org.apache.zookeeper.Watcher;
 
 public class ZkKeeperStates {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java b/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java
index 969a92b..53ddb35 100644
--- a/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java
+++ b/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java
@@ -17,10 +17,10 @@ import java.util.List;
 import java.util.Map;
 import org.apache.storm.Config;
 import org.apache.storm.security.auth.DefaultPrincipalToLocal;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.Id;
 import org.apache.storm.utils.ConfigUtils;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Id;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-client/test/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java b/storm-client/test/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java
deleted file mode 100644
index deae29c..0000000
--- a/storm-client/test/jvm/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version
- * 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
-
-package org.apache.storm.utils;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ZookeeperServerCnxnFactoryTest {
-
-    @Test(expected = RuntimeException.class)
-    public void test_Exception_In_Constructor_If_Port_Too_Large() {
-        new ZookeeperServerCnxnFactory(65536, 42);
-    }
-
-    @Test
-    public void testFactory() {
-        int arbitraryTestClients = 42;
-        ZookeeperServerCnxnFactory zkcfNegative = new ZookeeperServerCnxnFactory(-42, arbitraryTestClients);
-        int nextPort = zkcfNegative.port() + 1;
-        ZookeeperServerCnxnFactory zkcfNext = new ZookeeperServerCnxnFactory(nextPort, arbitraryTestClients);
-        Assert.assertEquals(zkcfNext.factory().getMaxClientCnxnsPerHost(), arbitraryTestClients);
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 44b9212..3619660 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -194,10 +194,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-core/test/clj/org/apache/storm/cluster_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/cluster_test.clj b/storm-core/test/clj/org/apache/storm/cluster_test.clj
index 65d95dc..7a34fbf 100644
--- a/storm-core/test/clj/org/apache/storm/cluster_test.clj
+++ b/storm-core/test/clj/org/apache/storm/cluster_test.clj
@@ -17,7 +17,7 @@
   (:import [java.util Arrays]
            [org.apache.storm.nimbus NimbusInfo])
   (:import [org.apache.storm.generated SupervisorInfo StormBase Assignment NimbusSummary TopologyStatus NodeInfo Credentials])
-  (:import [org.apache.zookeeper ZooDefs ZooDefs$Ids Watcher$Event$EventType])
+  (:import [org.apache.storm.shade.org.apache.zookeeper ZooDefs ZooDefs$Ids Watcher$Event$EventType])
   (:import [org.mockito Mockito])
   (:import [org.mockito.exceptions.base MockitoAssertionError])
   (:import [org.apache.storm.shade.org.apache.curator.framework CuratorFramework CuratorFrameworkFactory CuratorFrameworkFactory$Builder])

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/pom.xml
----------------------------------------------------------------------
diff --git a/storm-server/pom.xml b/storm-server/pom.xml
index c5ab387..24a478c 100644
--- a/storm-server/pom.xml
+++ b/storm-server/pom.xml
@@ -43,11 +43,6 @@
         when user needs to include 'storm-server' to topology jar due to LocalCluster.
         -->
         <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
index a51223c..691956d 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/BlobStoreUtils.java
@@ -30,13 +30,12 @@ import org.apache.storm.generated.ReadableBlobMeta;
 import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.security.auth.NimbusPrincipal;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
 import org.apache.storm.utils.CuratorUtils;
 import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.WrappedKeyNotFoundException;
 import org.apache.storm.utils.ZookeeperAuthInfo;
 import org.apache.thrift.transport.TTransportException;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -266,7 +265,7 @@ public class BlobStoreUtils {
                 LOG.debug("Updating state inside zookeeper for an update");
                 createStateInZookeeper(conf, key, nimbusDetails);
             }
-        } catch (NoNodeException | KeyNotFoundException e) {
+        } catch (KeeperException.NoNodeException | KeyNotFoundException e) {
             //race condition with a delete
             return;
         } catch (Exception exp) {

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java b/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
index 4dce22e..611d33c 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
@@ -19,9 +19,9 @@ import org.apache.storm.generated.KeyNotFoundException;
 import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.utils.WrappedKeyNotFoundException;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
index 4b10cd6..423a7a3 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
@@ -42,12 +42,12 @@ import org.apache.storm.generated.SettableBlobMeta;
 import org.apache.storm.nimbus.ILeaderElector;
 import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
 import org.apache.storm.utils.ConfigUtils;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.WrappedKeyAlreadyExistsException;
 import org.apache.storm.utils.WrappedKeyNotFoundException;
-import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -424,7 +424,7 @@ public class LocalFsBlobStore extends BlobStore {
         }
         try {
             replicationCount = zkClient.getChildren().forPath(BLOBSTORE_SUBTREE + key).size();
-        } catch (NoNodeException e) {
+        } catch (KeeperException.NoNodeException e) {
             //Race with delete
             //If it is not here the replication is 0 
         }

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index fc157a0..4a33d77 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -181,6 +181,8 @@ import org.apache.storm.security.auth.ThriftConnectionType;
 import org.apache.storm.security.auth.ThriftServer;
 import org.apache.storm.security.auth.workertoken.WorkerTokenManager;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.stats.StatsUtil;
 import org.apache.storm.utils.BufferInputStream;
 import org.apache.storm.utils.ConfigUtils;
@@ -206,16 +208,13 @@ import org.apache.storm.zookeeper.AclEnforcement;
 import org.apache.storm.zookeeper.ClientZookeeper;
 import org.apache.storm.zookeeper.Zookeeper;
 import org.apache.thrift.TException;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.ACL;
 import org.json.simple.JSONValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class Nimbus implements Iface, Shutdownable, DaemonCommon {
     @VisibleForTesting
-    public static final List<ACL> ZK_ACLS = Arrays.asList(ZooDefs.Ids.CREATOR_ALL_ACL.get(0),
-                                                          new ACL(ZooDefs.Perms.READ | ZooDefs.Perms.CREATE, ZooDefs.Ids.ANYONE_ID_UNSAFE));
+    public static final List<ACL> ZK_ACLS = Arrays.asList(ZooDefs.Ids.CREATOR_ALL_ACL.get(0));
     public static final SimpleVersion MIN_VERSION_SUPPORT_RPC_HEARTBEAT = new SimpleVersion("2.0.0");
     private static final Logger LOG = LoggerFactory.getLogger(Nimbus.class);
     //    Metrics

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java b/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
index 0035854..590cb13 100644
--- a/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
+++ b/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java
@@ -34,10 +34,10 @@ import org.apache.storm.generated.StormTopology;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.LeaderLatch;
+import org.apache.storm.shade.org.apache.zookeeper.CreateMode;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.zookeeper.ClientZookeeper;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java b/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
index c18edcc..c3265df 100644
--- a/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
+++ b/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
@@ -12,15 +12,16 @@
 
 package org.apache.storm.testing;
 
-import java.util.List;
+import org.apache.storm.shade.org.apache.zookeeper.server.NIOServerCnxnFactory;
 import org.apache.storm.zookeeper.Zookeeper;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
 
 /**
  * A local Zookeeper instance available for testing.
+ * ```java
  * try (InProcessZookeeper zk = new InProcessZookeeper) {
  *   // Run Tests...
  * }
+ * ```
  */
 public class InProcessZookeeper implements AutoCloseable {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java b/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
new file mode 100644
index 0000000..eb7019e
--- /dev/null
+++ b/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version
+ * 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+package org.apache.storm.utils;
+
+import java.io.IOException;
+import java.net.BindException;
+import java.net.InetSocketAddress;
+import org.apache.storm.shade.org.apache.zookeeper.server.NIOServerCnxnFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ZookeeperServerCnxnFactory {
+    private static final Logger LOG = LoggerFactory.getLogger(ZookeeperServerCnxnFactory.class);
+    int _port;
+    NIOServerCnxnFactory _factory;
+
+    public ZookeeperServerCnxnFactory(int port, int maxClientCnxns) {
+        //port range
+        int max;
+        if (port <= 0) {
+            _port = 2000;
+            max = 65535;
+        } else {
+            _port = port;
+            max = port;
+        }
+
+        try {
+            _factory = new NIOServerCnxnFactory();
+        } catch (IOException e) {
+            _port = 0;
+            _factory = null;
+            e.printStackTrace();
+            throw new RuntimeException(e.getMessage());
+        }
+
+        //look for available port
+        for (; _port <= max; _port++) {
+            try {
+                _factory.configure(new InetSocketAddress(_port), maxClientCnxns);
+                LOG.debug("Zookeeper server successfully binded at port " + _port);
+                break;
+            } catch (BindException e1) {
+            } catch (IOException e2) {
+                _port = 0;
+                _factory = null;
+                e2.printStackTrace();
+                throw new RuntimeException(e2.getMessage());
+            }
+        }
+
+        if (_port > max) {
+            _port = 0;
+            _factory = null;
+            LOG.error("Failed to find a port for Zookeeper");
+            throw new RuntimeException("No port is available to launch an inprocess zookeeper.");
+        }
+    }
+
+    public int port() {
+        return _port;
+    }
+
+    public NIOServerCnxnFactory factory() {
+        return _factory;
+    }
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java b/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
index 7a8e3e3..9c02b03 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
@@ -31,14 +31,14 @@ import org.apache.storm.generated.WorkerTokenServiceType;
 import org.apache.storm.nimbus.NimbusInfo;
 import org.apache.storm.security.auth.NimbusPrincipal;
 import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
+import org.apache.storm.shade.org.apache.zookeeper.KeeperException;
+import org.apache.storm.shade.org.apache.zookeeper.ZooDefs;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.data.Id;
+import org.apache.storm.shade.org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 import org.apache.storm.utils.ObjectReader;
 import org.apache.storm.utils.ServerUtils;
 import org.apache.storm.utils.Utils;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Id;
-import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
index bed2183..03fec1f 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
@@ -27,8 +27,8 @@ import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.LeaderLatch;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.LeaderLatchListener;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.Participant;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
 import org.apache.storm.utils.Utils;
-import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java b/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
index 82e97a6..f30c246 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
@@ -38,9 +38,9 @@ import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.LeaderLatch;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.LeaderLatchListener;
 import org.apache.storm.shade.org.apache.curator.framework.recipes.leader.Participant;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.ZooKeeperServer;
+import org.apache.storm.shade.org.apache.zookeeper.data.ACL;
+import org.apache.storm.shade.org.apache.zookeeper.server.NIOServerCnxnFactory;
+import org.apache.storm.shade.org.apache.zookeeper.server.ZooKeeperServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java b/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java
index 536beb2..19cdfed 100644
--- a/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java
+++ b/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java
@@ -19,7 +19,7 @@ import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework;
 import org.apache.storm.shade.org.apache.curator.framework.api.ExistsBuilder;
 import org.apache.storm.shade.org.apache.curator.framework.api.GetChildrenBuilder;
 import org.apache.storm.shade.org.apache.curator.framework.api.Pathable;
-import org.apache.zookeeper.data.Stat;
+import org.apache.storm.shade.org.apache.zookeeper.data.Stat;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

http://git-wip-us.apache.org/repos/asf/storm/blob/9b83b46d/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java b/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java
new file mode 100644
index 0000000..cfc9acb
--- /dev/null
+++ b/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version
+ * 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+package org.apache.storm.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ZookeeperServerCnxnFactoryTest {
+
+    @Test(expected = RuntimeException.class)
+    public void test_Exception_In_Constructor_If_Port_Too_Large() {
+        new ZookeeperServerCnxnFactory(65536, 42);
+    }
+
+    @Test
+    public void testFactory() {
+        int arbitraryTestClients = 42;
+        ZookeeperServerCnxnFactory zkcfNegative = new ZookeeperServerCnxnFactory(-42, arbitraryTestClients);
+        int nextPort = zkcfNegative.port() + 1;
+        ZookeeperServerCnxnFactory zkcfNext = new ZookeeperServerCnxnFactory(nextPort, arbitraryTestClients);
+        Assert.assertEquals(zkcfNext.factory().getMaxClientCnxnsPerHost(), arbitraryTestClients);
+    }
+}


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
index 915b6cf..34cf5b4 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ErrorInfo.java
@@ -25,16 +25,16 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorInfo");
+public class ErrorInfo implements org.apache.storm.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ErrorInfo");
 
-  private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField ERROR_TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("error_time_secs", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("error", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField ERROR_TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("error_time_secs", org.apache.storm.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("host", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.I32, (short)4);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ErrorInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ErrorInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ErrorInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ErrorInfoTupleSchemeFactory();
 
   private java.lang.String error; // required
   private int error_time_secs; // required
@@ -42,7 +42,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
   private int port; // 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 {
     ERROR((short)1, "error"),
     ERROR_TIME_SECS((short)2, "error_time_secs"),
     HOST((short)3, "host"),
@@ -113,19 +113,19 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
   private static final int __PORT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.HOST,_Fields.PORT};
-  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.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ERROR_TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("error_time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.ERROR, new org.apache.storm.thrift.meta_data.FieldMetaData("error", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ERROR_TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("error_time_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("host", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ErrorInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ErrorInfo.class, metaDataMap);
   }
 
   public ErrorInfo() {
@@ -203,16 +203,16 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
   }
 
   public void unset_error_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field error_time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_error_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID);
   }
 
   public void set_error_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_host() {
@@ -248,16 +248,16 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
   }
 
   public void unset_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -422,7 +422,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
       return lastComparison;
     }
     if (is_set_error()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error, other.error);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.error, other.error);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -432,7 +432,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
       return lastComparison;
     }
     if (is_set_error_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error_time_secs, other.error_time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.error_time_secs, other.error_time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -442,7 +442,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
       return lastComparison;
     }
     if (is_set_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -452,7 +452,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -464,11 +464,11 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
     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);
   }
 
@@ -508,14 +508,14 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
     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_error()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'error' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'error' is unset! Struct:" + toString());
     }
 
     if (!is_set_error_time_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'error_time_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'error_time_secs' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -523,8 +523,8 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
 
   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);
     }
   }
@@ -533,64 +533,64 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
     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 ErrorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ErrorInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ErrorInfoStandardScheme getScheme() {
       return new ErrorInfoStandardScheme();
     }
   }
 
-  private static class ErrorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ErrorInfo> {
+  private static class ErrorInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ErrorInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ErrorInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ErrorInfo 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: // ERROR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.error = iprot.readString();
               struct.set_error_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: // ERROR_TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.error_time_secs = iprot.readI32();
               struct.set_error_time_secs_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: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.host = iprot.readString();
               struct.set_host_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.port = iprot.readI32();
               struct.set_port_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();
       }
@@ -598,7 +598,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ErrorInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ErrorInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -628,17 +628,17 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
 
   }
 
-  private static class ErrorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ErrorInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ErrorInfoTupleScheme getScheme() {
       return new ErrorInfoTupleScheme();
     }
   }
 
-  private static class ErrorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<ErrorInfo> {
+  private static class ErrorInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ErrorInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ErrorInfo 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, ErrorInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.error);
       oprot.writeI32(struct.error_time_secs);
       java.util.BitSet optionals = new java.util.BitSet();
@@ -658,8 +658,8 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ErrorInfo 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, ErrorInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.error = iprot.readString();
       struct.set_error_isSet(true);
       struct.error_time_secs = iprot.readI32();
@@ -676,8 +676,8 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
     }
   }
 
-  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/ExecutorAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java
index 8091aca..154495c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorAggregateStats.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 ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorAggregateStats, ExecutorAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorAggregateStats> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorAggregateStats");
+public class ExecutorAggregateStats implements org.apache.storm.thrift.TBase<ExecutorAggregateStats, ExecutorAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorAggregateStats> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField EXEC_SUMMARY_FIELD_DESC = new org.apache.thrift.protocol.TField("exec_summary", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField EXEC_SUMMARY_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("exec_summary", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("stats", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorAggregateStatsStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorAggregateStatsTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorAggregateStatsStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorAggregateStatsTupleSchemeFactory();
 
   private ExecutorSummary exec_summary; // optional
   private ComponentAggregateStats stats; // 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 {
     EXEC_SUMMARY((short)1, "exec_summary"),
     STATS((short)2, "stats");
 
@@ -100,15 +100,15 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.EXEC_SUMMARY,_Fields.STATS};
-  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.EXEC_SUMMARY, new org.apache.thrift.meta_data.FieldMetaData("exec_summary", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorSummary.class)));
-    tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComponentAggregateStats.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.EXEC_SUMMARY, new org.apache.storm.thrift.meta_data.FieldMetaData("exec_summary", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ExecutorSummary.class)));
+    tmpMap.put(_Fields.STATS, new org.apache.storm.thrift.meta_data.FieldMetaData("stats", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, ComponentAggregateStats.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorAggregateStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorAggregateStats.class, metaDataMap);
   }
 
   public ExecutorAggregateStats() {
@@ -294,7 +294,7 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
       return lastComparison;
     }
     if (is_set_exec_summary()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exec_summary, other.exec_summary);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.exec_summary, other.exec_summary);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -304,7 +304,7 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
       return lastComparison;
     }
     if (is_set_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, other.stats);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.stats, other.stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -316,11 +316,11 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
     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);
   }
 
@@ -352,7 +352,7 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
     if (exec_summary != null) {
@@ -365,58 +365,58 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
 
   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 ExecutorAggregateStatsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorAggregateStatsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorAggregateStatsStandardScheme getScheme() {
       return new ExecutorAggregateStatsStandardScheme();
     }
   }
 
-  private static class ExecutorAggregateStatsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExecutorAggregateStats> {
+  private static class ExecutorAggregateStatsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorAggregateStats> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorAggregateStats struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorAggregateStats 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: // EXEC_SUMMARY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.exec_summary = new ExecutorSummary();
               struct.exec_summary.read(iprot);
               struct.set_exec_summary_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: // STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
               struct.stats = new ComponentAggregateStats();
               struct.stats.read(iprot);
               struct.set_stats_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();
       }
@@ -424,7 +424,7 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorAggregateStats struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorAggregateStats struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -448,17 +448,17 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
 
   }
 
-  private static class ExecutorAggregateStatsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorAggregateStatsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorAggregateStatsTupleScheme getScheme() {
       return new ExecutorAggregateStatsTupleScheme();
     }
   }
 
-  private static class ExecutorAggregateStatsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ExecutorAggregateStats> {
+  private static class ExecutorAggregateStatsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ExecutorAggregateStats> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorAggregateStats 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, ExecutorAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_exec_summary()) {
         optionals.set(0);
@@ -476,8 +476,8 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorAggregateStats 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, ExecutorAggregateStats struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.exec_summary = new ExecutorSummary();
@@ -492,8 +492,8 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
     }
   }
 
-  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/ExecutorInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java
index 24796c4..805c9ce 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorInfo.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 ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorInfo> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorInfo");
+public class ExecutorInfo implements org.apache.storm.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorInfo> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorInfo");
 
-  private static final org.apache.thrift.protocol.TField TASK_START_FIELD_DESC = new org.apache.thrift.protocol.TField("task_start", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField TASK_END_FIELD_DESC = new org.apache.thrift.protocol.TField("task_end", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField TASK_START_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("task_start", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField TASK_END_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("task_end", org.apache.storm.thrift.protocol.TType.I32, (short)2);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorInfoStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorInfoTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ExecutorInfoStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ExecutorInfoTupleSchemeFactory();
 
   private int task_start; // required
   private int task_end; // 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 {
     TASK_START((short)1, "task_start"),
     TASK_END((short)2, "task_end");
 
@@ -102,15 +102,15 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   private static final int __TASK_START_ISSET_ID = 0;
   private static final int __TASK_END_ISSET_ID = 1;
   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.TASK_START, new org.apache.thrift.meta_data.FieldMetaData("task_start", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TASK_END, new org.apache.thrift.meta_data.FieldMetaData("task_end", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    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.TASK_START, new org.apache.storm.thrift.meta_data.FieldMetaData("task_start", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TASK_END, new org.apache.storm.thrift.meta_data.FieldMetaData("task_end", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorInfo.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorInfo.class, metaDataMap);
   }
 
   public ExecutorInfo() {
@@ -158,16 +158,16 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   }
 
   public void unset_task_start() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TASK_START_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TASK_START_ISSET_ID);
   }
 
   /** Returns true if field task_start is set (has been assigned a value) and false otherwise */
   public boolean is_set_task_start() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TASK_START_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TASK_START_ISSET_ID);
   }
 
   public void set_task_start_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TASK_START_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TASK_START_ISSET_ID, value);
   }
 
   public int get_task_end() {
@@ -180,16 +180,16 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   }
 
   public void unset_task_end() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TASK_END_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TASK_END_ISSET_ID);
   }
 
   /** Returns true if field task_end is set (has been assigned a value) and false otherwise */
   public boolean is_set_task_end() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TASK_END_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TASK_END_ISSET_ID);
   }
 
   public void set_task_end_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TASK_END_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TASK_END_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -300,7 +300,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
       return lastComparison;
     }
     if (is_set_task_start()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_start, other.task_start);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.task_start, other.task_start);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -310,7 +310,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
       return lastComparison;
     }
     if (is_set_task_end()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_end, other.task_end);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.task_end, other.task_end);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -322,11 +322,11 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
     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);
   }
 
@@ -346,14 +346,14 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
     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_task_start()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_start' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'task_start' is unset! Struct:" + toString());
     }
 
     if (!is_set_task_end()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_end' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'task_end' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -361,8 +361,8 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
 
   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);
     }
   }
@@ -371,48 +371,48 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
     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 ExecutorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorInfoStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorInfoStandardScheme getScheme() {
       return new ExecutorInfoStandardScheme();
     }
   }
 
-  private static class ExecutorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<ExecutorInfo> {
+  private static class ExecutorInfoStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<ExecutorInfo> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorInfo struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, ExecutorInfo 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: // TASK_START
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.task_start = iprot.readI32();
               struct.set_task_start_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: // TASK_END
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.task_end = iprot.readI32();
               struct.set_task_end_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();
       }
@@ -420,7 +420,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorInfo struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, ExecutorInfo struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -436,24 +436,24 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
 
   }
 
-  private static class ExecutorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class ExecutorInfoTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public ExecutorInfoTupleScheme getScheme() {
       return new ExecutorInfoTupleScheme();
     }
   }
 
-  private static class ExecutorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<ExecutorInfo> {
+  private static class ExecutorInfoTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<ExecutorInfo> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorInfo 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, ExecutorInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI32(struct.task_start);
       oprot.writeI32(struct.task_end);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorInfo 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, ExecutorInfo struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.task_start = iprot.readI32();
       struct.set_task_start_isSet(true);
       struct.task_end = iprot.readI32();
@@ -461,8 +461,8 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
     }
   }
 
-  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/ExecutorSpecificStats.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java
index 7e7e230..3d5a264 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/ExecutorSpecificStats.java
@@ -24,13 +24,13 @@
 package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpecificStats, ExecutorSpecificStats._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSpecificStats");
-  private static final org.apache.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField SPOUT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+public class ExecutorSpecificStats extends org.apache.storm.thrift.TUnion<ExecutorSpecificStats, ExecutorSpecificStats._Fields> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("ExecutorSpecificStats");
+  private static final org.apache.storm.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("bolt", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField SPOUT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("spout", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
   /** 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 {
     BOLT((short)1, "bolt"),
     SPOUT((short)2, "spout");
 
@@ -90,15 +90,15 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
     }
   }
 
-  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.BOLT, new org.apache.thrift.meta_data.FieldMetaData("bolt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BoltStats.class)));
-    tmpMap.put(_Fields.SPOUT, new org.apache.thrift.meta_data.FieldMetaData("spout", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SpoutStats.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.BOLT, new org.apache.storm.thrift.meta_data.FieldMetaData("bolt", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, BoltStats.class)));
+    tmpMap.put(_Fields.SPOUT, new org.apache.storm.thrift.meta_data.FieldMetaData("spout", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, SpoutStats.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSpecificStats.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorSpecificStats.class, metaDataMap);
   }
 
   public ExecutorSpecificStats() {
@@ -148,7 +148,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
 
   @Override
-  protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected java.lang.Object standardSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TField field) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -159,7 +159,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
             bolt.read(iprot);
             return bolt;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         case SPOUT:
@@ -169,20 +169,20 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
             spout.read(iprot);
             return spout;
           } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
             return null;
           }
         default:
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+      org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
 
   @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case BOLT:
         BoltStats bolt = (BoltStats)value_;
@@ -198,7 +198,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
 
   @Override
-  protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+  protected java.lang.Object tupleSchemeReadValue(org.apache.storm.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.storm.thrift.TException {
     _Fields setField = _Fields.findByThriftId(fieldID);
     if (setField != null) {
       switch (setField) {
@@ -216,12 +216,12 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
           throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
-      throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
     }
   }
 
   @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void tupleSchemeWriteValue(org.apache.storm.thrift.protocol.TProtocol oprot) throws org.apache.storm.thrift.TException {
     switch (setField_) {
       case BOLT:
         BoltStats bolt = (BoltStats)value_;
@@ -237,7 +237,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
 
   @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
+  protected org.apache.storm.thrift.protocol.TField getFieldDesc(_Fields setField) {
     switch (setField) {
       case BOLT:
         return BOLT_FIELD_DESC;
@@ -249,7 +249,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
 
   @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
+  protected org.apache.storm.thrift.protocol.TStruct getStructDesc() {
     return STRUCT_DESC;
   }
 
@@ -315,9 +315,9 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
 
   @Override
   public int compareTo(ExecutorSpecificStats other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    int lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
     if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+      return org.apache.storm.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
     }
     return lastComparison;
   }
@@ -327,12 +327,12 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   public int hashCode() {
     java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
     list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
+    org.apache.storm.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
       list.add(setField.getThriftFieldId());
       java.lang.Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+      if (value instanceof org.apache.storm.thrift.TEnum) {
+        list.add(((org.apache.storm.thrift.TEnum)getFieldValue()).getValue());
       } else {
         list.add(value);
       }
@@ -341,8 +341,8 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
   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);
     }
   }
@@ -350,8 +350,8 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
 
   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);
     }
   }


[08/50] [abbrv] storm git commit: STORM-2882: Addressed review comments

Posted by bo...@apache.org.
STORM-2882: Addressed review comments


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/71b61d9b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/71b61d9b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/71b61d9b

Branch: refs/heads/master
Commit: 71b61d9b2728026c848e9aa45e23a3dfae041f9a
Parents: e584c61
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jun 4 10:49:01 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500

----------------------------------------------------------------------
 DEVELOPER.md                   |  4 ++--
 examples/storm-loadgen/pom.xml | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/71b61d9b/DEVELOPER.md
----------------------------------------------------------------------
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 93541e8..1ae0ea6 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -239,8 +239,8 @@ To pull in a merge request you should generally follow the command line instruct
 # Build the code and run the tests
 
 ## Prerequisites
-To work around a conflict between the shade plugin and maven https://issues.apache.org/jira/browse/MSHADE-206 the build is spit into 2 parts.
-First a set of dependencies are shaded and installed by running.
+To work around a conflict between the shade plugin and maven https://issues.apache.org/jira/browse/MSHADE-206, a set of 
+dependencies needs to be shaded and installed by running:
 
 ```sh
 cd shaded-deps

http://git-wip-us.apache.org/repos/asf/storm/blob/71b61d9b/examples/storm-loadgen/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml
index b566848..68478b5 100644
--- a/examples/storm-loadgen/pom.xml
+++ b/examples/storm-loadgen/pom.xml
@@ -71,18 +71,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-      <dependency>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>com.googlecode.json-simple</groupId>
-          <artifactId>json-simple</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.yaml</groupId>
-          <artifactId>snakeyaml</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java b/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
index 19eccfd..741e06e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologySummary.java
@@ -25,30 +25,30 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable, Comparable<TopologySummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)7);
-  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)8);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_version", org.apache.thrift.protocol.TType.STRING, (short)9);
-  private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)513);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)514);
-  private static final org.apache.thrift.protocol.TField REPLICATION_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("replication_count", org.apache.thrift.protocol.TType.I32, (short)515);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)521);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)522);
-  private static final org.apache.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)523);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)524);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)525);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)526);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologySummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologySummaryTupleSchemeFactory();
+public class TopologySummary implements org.apache.storm.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable, Comparable<TopologySummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("TopologySummary");
+
+  private static final org.apache.storm.thrift.protocol.TField ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("name", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_tasks", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_executors", org.apache.storm.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_workers", org.apache.storm.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("status", org.apache.storm.thrift.protocol.TType.STRING, (short)7);
+  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)8);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_VERSION_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_version", org.apache.storm.thrift.protocol.TType.STRING, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("sched_status", org.apache.storm.thrift.protocol.TType.STRING, (short)513);
+  private static final org.apache.storm.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("owner", org.apache.storm.thrift.protocol.TType.STRING, (short)514);
+  private static final org.apache.storm.thrift.protocol.TField REPLICATION_COUNT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("replication_count", org.apache.storm.thrift.protocol.TType.I32, (short)515);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)521);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)522);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)523);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)524);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)525);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)526);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TopologySummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TopologySummaryTupleSchemeFactory();
 
   private java.lang.String id; // required
   private java.lang.String name; // required
@@ -70,7 +70,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   private double assigned_cpu; // 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 {
     ID((short)1, "id"),
     NAME((short)2, "name"),
     NUM_TASKS((short)3, "num_tasks"),
@@ -192,47 +192,47 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   private static final int __ASSIGNED_CPU_ISSET_ID = 10;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.STORM_VERSION,_Fields.TOPOLOGY_VERSION,_Fields.SCHED_STATUS,_Fields.OWNER,_Fields.REPLICATION_COUNT,_Fields.REQUESTED_MEMONHEAP,_Fields.REQUESTED_MEMOFFHEAP,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_MEMONHEAP,_Fields.ASSIGNED_MEMOFFHEAP,_Fields.ASSIGNED_CPU};
-  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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NUM_TASKS, new org.apache.thrift.meta_data.FieldMetaData("num_tasks", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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.TOPOLOGY_VERSION, new org.apache.thrift.meta_data.FieldMetaData("topology_version", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SCHED_STATUS, new org.apache.thrift.meta_data.FieldMetaData("sched_status", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.REPLICATION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("replication_count", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.ID, new org.apache.storm.thrift.meta_data.FieldMetaData("id", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("name", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NUM_TASKS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_tasks", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_executors", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.NUM_WORKERS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_workers", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("status", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        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.TOPOLOGY_VERSION, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_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.SCHED_STATUS, new org.apache.storm.thrift.meta_data.FieldMetaData("sched_status", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.OWNER, new org.apache.storm.thrift.meta_data.FieldMetaData("owner", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.REPLICATION_COUNT, new org.apache.storm.thrift.meta_data.FieldMetaData("replication_count", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologySummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologySummary.class, metaDataMap);
   }
 
   public TopologySummary() {
@@ -393,16 +393,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_num_tasks() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   /** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_tasks() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
   }
 
   public void set_num_tasks_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
   }
 
   public int get_num_executors() {
@@ -415,16 +415,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_num_executors() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_executors() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   public void set_num_executors_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
   }
 
   public int get_num_workers() {
@@ -437,16 +437,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_num_workers() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_workers() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
   }
 
   public void set_num_workers_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -459,16 +459,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public java.lang.String get_status() {
@@ -596,16 +596,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_replication_count() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   /** Returns true if field replication_count is set (has been assigned a value) and false otherwise */
   public boolean is_set_replication_count() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID);
   }
 
   public void set_replication_count_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REPLICATION_COUNT_ISSET_ID, value);
   }
 
   public double get_requested_memonheap() {
@@ -618,16 +618,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_requested_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_requested_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_requested_memoffheap() {
@@ -640,16 +640,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_requested_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_requested_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_requested_cpu() {
@@ -662,16 +662,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_requested_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   public void set_requested_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
   }
 
   public double get_assigned_memonheap() {
@@ -684,16 +684,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_assigned_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_assigned_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_memoffheap() {
@@ -706,16 +706,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_assigned_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_assigned_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_cpu() {
@@ -728,16 +728,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
   }
 
   public void unset_assigned_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   /** Returns true if field assigned_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   public void set_assigned_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -1222,27 +1222,27 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
     hashCode = hashCode * 8191 + ((is_set_requested_memonheap()) ? 131071 : 524287);
     if (is_set_requested_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_memoffheap()) ? 131071 : 524287);
     if (is_set_requested_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287);
     if (is_set_requested_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memonheap()) ? 131071 : 524287);
     if (is_set_assigned_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memoffheap()) ? 131071 : 524287);
     if (is_set_assigned_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_cpu()) ? 131071 : 524287);
     if (is_set_assigned_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_cpu);
 
     return hashCode;
   }
@@ -1260,7 +1260,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.id, other.id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1270,7 +1270,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1280,7 +1280,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_num_tasks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1290,7 +1290,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_num_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1300,7 +1300,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_num_workers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1310,7 +1310,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1320,7 +1320,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1330,7 +1330,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       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;
       }
@@ -1340,7 +1340,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_topology_version()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_version, other.topology_version);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_version, other.topology_version);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1350,7 +1350,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_sched_status()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1360,7 +1360,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_owner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.owner, other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1370,7 +1370,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_replication_count()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_count, other.replication_count);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.replication_count, other.replication_count);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1380,7 +1380,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_requested_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1390,7 +1390,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_requested_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1400,7 +1400,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_requested_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1410,7 +1410,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_assigned_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1420,7 +1420,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_assigned_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1430,7 +1430,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       return lastComparison;
     }
     if (is_set_assigned_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1442,11 +1442,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     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);
   }
 
@@ -1580,34 +1580,34 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     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_id()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
     }
 
     if (!is_set_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
     }
 
     if (!is_set_num_tasks()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_tasks' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'num_tasks' is unset! Struct:" + toString());
     }
 
     if (!is_set_num_executors()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_executors' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'num_executors' is unset! Struct:" + toString());
     }
 
     if (!is_set_num_workers()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString());
     }
 
     if (!is_set_uptime_secs()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
     if (!is_set_status()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -1615,8 +1615,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
   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);
     }
   }
@@ -1625,176 +1625,176 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     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 TopologySummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologySummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologySummaryStandardScheme getScheme() {
       return new TopologySummaryStandardScheme();
     }
   }
 
-  private static class TopologySummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TopologySummary> {
+  private static class TopologySummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<TopologySummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TopologySummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, TopologySummary 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: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.id = iprot.readString();
               struct.set_id_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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_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: // NUM_TASKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_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: // NUM_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_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: // NUM_WORKERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_workers = iprot.readI32();
               struct.set_num_workers_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_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: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.status = iprot.readString();
               struct.set_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 8: // 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 9: // TOPOLOGY_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_version = iprot.readString();
               struct.set_topology_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 513: // SCHED_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.sched_status = iprot.readString();
               struct.set_sched_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 514: // OWNER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 515: // REPLICATION_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.replication_count = iprot.readI32();
               struct.set_replication_count_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 521: // REQUESTED_MEMONHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_memonheap = iprot.readDouble();
               struct.set_requested_memonheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 522: // REQUESTED_MEMOFFHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_memoffheap = iprot.readDouble();
               struct.set_requested_memoffheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 523: // REQUESTED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_cpu = iprot.readDouble();
               struct.set_requested_cpu_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 524: // ASSIGNED_MEMONHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_memonheap = iprot.readDouble();
               struct.set_assigned_memonheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 525: // ASSIGNED_MEMOFFHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_memoffheap = iprot.readDouble();
               struct.set_assigned_memoffheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 526: // ASSIGNED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_cpu = iprot.readDouble();
               struct.set_assigned_cpu_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();
       }
@@ -1802,7 +1802,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, TopologySummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, TopologySummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1902,17 +1902,17 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
 
   }
 
-  private static class TopologySummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class TopologySummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public TopologySummaryTupleScheme getScheme() {
       return new TopologySummaryTupleScheme();
     }
   }
 
-  private static class TopologySummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<TopologySummary> {
+  private static class TopologySummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<TopologySummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TopologySummary 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, TopologySummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.id);
       oprot.writeString(struct.name);
       oprot.writeI32(struct.num_tasks);
@@ -1991,8 +1991,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TopologySummary 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, TopologySummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.id = iprot.readString();
       struct.set_id_isSet(true);
       struct.name = iprot.readString();
@@ -2055,8 +2055,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
     }
   }
 
-  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/WorkerMetricList.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java
index a61ad9a..e9e84f9 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerMetricList.java
@@ -25,18 +25,18 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricList, WorkerMetricList._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetricList> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerMetricList");
+public class WorkerMetricList implements org.apache.storm.thrift.TBase<WorkerMetricList, WorkerMetricList._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerMetricList> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerMetricList");
 
-  private static final org.apache.thrift.protocol.TField METRICS_FIELD_DESC = new org.apache.thrift.protocol.TField("metrics", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField METRICS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("metrics", org.apache.storm.thrift.protocol.TType.LIST, (short)1);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricListStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricListTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerMetricListStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerMetricListTupleSchemeFactory();
 
   private java.util.List<WorkerMetricPoint> metrics; // 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 {
     METRICS((short)1, "metrics");
 
     private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -94,14 +94,14 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
   }
 
   // isset id assignments
-  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.METRICS, new org.apache.thrift.meta_data.FieldMetaData("metrics", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        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, WorkerMetricPoint.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.METRICS, new org.apache.storm.thrift.meta_data.FieldMetaData("metrics", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.storm.thrift.meta_data.ListMetaData(org.apache.storm.thrift.protocol.TType.LIST, 
+            new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, WorkerMetricPoint.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetricList.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerMetricList.class, metaDataMap);
   }
 
   public WorkerMetricList() {
@@ -260,7 +260,7 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
       return lastComparison;
     }
     if (is_set_metrics()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metrics, other.metrics);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.metrics, other.metrics);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -272,11 +272,11 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     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);
   }
 
@@ -296,49 +296,49 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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 WorkerMetricListStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerMetricListStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerMetricListStandardScheme getScheme() {
       return new WorkerMetricListStandardScheme();
     }
   }
 
-  private static class WorkerMetricListStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerMetricList> {
+  private static class WorkerMetricListStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerMetricList> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerMetricList struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerMetricList 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: // METRICS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list896 = iprot.readListBegin();
+                org.apache.storm.thrift.protocol.TList _list896 = iprot.readListBegin();
                 struct.metrics = new java.util.ArrayList<WorkerMetricPoint>(_list896.size);
                 WorkerMetricPoint _elem897;
                 for (int _i898 = 0; _i898 < _list896.size; ++_i898)
@@ -351,11 +351,11 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
               }
               struct.set_metrics_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();
       }
@@ -363,14 +363,14 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerMetricList struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerMetricList struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
       if (struct.metrics != null) {
         oprot.writeFieldBegin(METRICS_FIELD_DESC);
         {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.metrics.size()));
+          oprot.writeListBegin(new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, struct.metrics.size()));
           for (WorkerMetricPoint _iter899 : struct.metrics)
           {
             _iter899.write(oprot);
@@ -385,17 +385,17 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
 
   }
 
-  private static class WorkerMetricListTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerMetricListTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerMetricListTupleScheme getScheme() {
       return new WorkerMetricListTupleScheme();
     }
   }
 
-  private static class WorkerMetricListTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerMetricList> {
+  private static class WorkerMetricListTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerMetricList> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerMetricList 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, WorkerMetricList struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_metrics()) {
         optionals.set(0);
@@ -413,12 +413,12 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerMetricList 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, WorkerMetricList struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list901 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.storm.thrift.protocol.TList _list901 = new org.apache.storm.thrift.protocol.TList(org.apache.storm.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.metrics = new java.util.ArrayList<WorkerMetricPoint>(_list901.size);
           WorkerMetricPoint _elem902;
           for (int _i903 = 0; _i903 < _list901.size; ++_i903)
@@ -433,8 +433,8 @@ public class WorkerMetricList implements org.apache.thrift.TBase<WorkerMetricLis
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java
index 2530abf..e5647f5 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java
@@ -25,27 +25,27 @@ package org.apache.storm.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
-public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, WorkerSummary._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerSummary> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerSummary");
-
-  private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_name", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField COMPONENT_TO_NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("component_to_num_tasks", org.apache.thrift.protocol.TType.MAP, (short)7);
-  private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)8);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)9);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)521);
-  private static final org.apache.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)522);
-  private static final org.apache.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("requested_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)523);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memonheap", org.apache.thrift.protocol.TType.DOUBLE, (short)524);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)525);
-  private static final org.apache.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)526);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerSummaryStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerSummaryTupleSchemeFactory();
+public class WorkerSummary implements org.apache.storm.thrift.TBase<WorkerSummary, WorkerSummary._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerSummary> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerSummary");
+
+  private static final org.apache.storm.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("supervisor_id", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("host", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("port", org.apache.storm.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_id", org.apache.storm.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.storm.thrift.protocol.TField TOPOLOGY_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("topology_name", org.apache.storm.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.storm.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("num_executors", org.apache.storm.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.storm.thrift.protocol.TField COMPONENT_TO_NUM_TASKS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("component_to_num_tasks", org.apache.storm.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.storm.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("time_secs", org.apache.storm.thrift.protocol.TType.I32, (short)8);
+  private static final org.apache.storm.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("uptime_secs", org.apache.storm.thrift.protocol.TType.I32, (short)9);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)521);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)522);
+  private static final org.apache.storm.thrift.protocol.TField REQUESTED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("requested_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)523);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMONHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memonheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)524);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_memoffheap", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)525);
+  private static final org.apache.storm.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("assigned_cpu", org.apache.storm.thrift.protocol.TType.DOUBLE, (short)526);
+
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerSummaryStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerSummaryTupleSchemeFactory();
 
   private java.lang.String supervisor_id; // optional
   private java.lang.String host; // optional
@@ -64,7 +64,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   private double assigned_cpu; // 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 {
     SUPERVISOR_ID((short)1, "supervisor_id"),
     HOST((short)2, "host"),
     PORT((short)3, "port"),
@@ -176,43 +176,43 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   private static final int __ASSIGNED_CPU_ISSET_ID = 9;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.SUPERVISOR_ID,_Fields.HOST,_Fields.PORT,_Fields.TOPOLOGY_ID,_Fields.TOPOLOGY_NAME,_Fields.NUM_EXECUTORS,_Fields.COMPONENT_TO_NUM_TASKS,_Fields.TIME_SECS,_Fields.UPTIME_SECS,_Fields.REQUESTED_MEMONHEAP,_Fields.REQUESTED_MEMOFFHEAP,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_MEMONHEAP,_Fields.ASSIGNED_MEMOFFHEAP,_Fields.ASSIGNED_CPU};
-  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.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TOPOLOGY_NAME, new org.apache.thrift.meta_data.FieldMetaData("topology_name", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.COMPONENT_TO_NUM_TASKS, new org.apache.thrift.meta_data.FieldMetaData("component_to_num_tasks", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
-    tmpMap.put(_Fields.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+    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.SUPERVISOR_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.HOST, new org.apache.storm.thrift.meta_data.FieldMetaData("host", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.storm.thrift.meta_data.FieldMetaData("port", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_id", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TOPOLOGY_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("topology_name", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.storm.thrift.meta_data.FieldMetaData("num_executors", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.COMPONENT_TO_NUM_TASKS, new org.apache.storm.thrift.meta_data.FieldMetaData("component_to_num_tasks", 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.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.TIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("time_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.UPTIME_SECS, new org.apache.storm.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.REQUESTED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.REQUESTED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("requested_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMONHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memonheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_MEMOFFHEAP, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_memoffheap", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
+    tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.storm.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.storm.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerSummary.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerSummary.class, metaDataMap);
   }
 
   public WorkerSummary() {
@@ -340,16 +340,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_port() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public java.lang.String get_topology_id() {
@@ -408,16 +408,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_num_executors() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
   public boolean is_set_num_executors() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
   }
 
   public void set_num_executors_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
   }
 
   public int get_component_to_num_tasks_size() {
@@ -464,16 +464,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_time_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_time_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
   }
 
   public void set_time_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -486,16 +486,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_uptime_secs() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public double get_requested_memonheap() {
@@ -508,16 +508,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_requested_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_requested_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_requested_memoffheap() {
@@ -530,16 +530,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_requested_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field requested_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_requested_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_requested_cpu() {
@@ -552,16 +552,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_requested_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_requested_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID);
   }
 
   public void set_requested_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value);
   }
 
   public double get_assigned_memonheap() {
@@ -574,16 +574,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_assigned_memonheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memonheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memonheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID);
   }
 
   public void set_assigned_memonheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_memoffheap() {
@@ -596,16 +596,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_assigned_memoffheap() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   /** Returns true if field assigned_memoffheap is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_memoffheap() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID);
   }
 
   public void set_assigned_memoffheap_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value);
   }
 
   public double get_assigned_cpu() {
@@ -618,16 +618,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
   }
 
   public void unset_assigned_cpu() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   /** Returns true if field assigned_cpu is set (has been assigned a value) and false otherwise */
   public boolean is_set_assigned_cpu() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
+    return org.apache.storm.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID);
   }
 
   public void set_assigned_cpu_isSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
+    __isset_bitfield = org.apache.storm.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, java.lang.Object value) {
@@ -1042,27 +1042,27 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
 
     hashCode = hashCode * 8191 + ((is_set_requested_memonheap()) ? 131071 : 524287);
     if (is_set_requested_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_memoffheap()) ? 131071 : 524287);
     if (is_set_requested_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287);
     if (is_set_requested_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(requested_cpu);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memonheap()) ? 131071 : 524287);
     if (is_set_assigned_memonheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memonheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memonheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_memoffheap()) ? 131071 : 524287);
     if (is_set_assigned_memoffheap())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memoffheap);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_memoffheap);
 
     hashCode = hashCode * 8191 + ((is_set_assigned_cpu()) ? 131071 : 524287);
     if (is_set_assigned_cpu())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_cpu);
+      hashCode = hashCode * 8191 + org.apache.storm.thrift.TBaseHelper.hashCode(assigned_cpu);
 
     return hashCode;
   }
@@ -1080,7 +1080,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_supervisor_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1090,7 +1090,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1100,7 +1100,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1110,7 +1110,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_topology_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1120,7 +1120,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_topology_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_name, other.topology_name);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.topology_name, other.topology_name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1130,7 +1130,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_num_executors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1140,7 +1140,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_component_to_num_tasks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_to_num_tasks, other.component_to_num_tasks);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.component_to_num_tasks, other.component_to_num_tasks);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1150,7 +1150,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_time_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1160,7 +1160,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1170,7 +1170,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_requested_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memonheap, other.requested_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1180,7 +1180,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_requested_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_memoffheap, other.requested_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1190,7 +1190,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_requested_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.requested_cpu, other.requested_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1200,7 +1200,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_assigned_memonheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memonheap, other.assigned_memonheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1210,7 +1210,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_assigned_memoffheap()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_memoffheap, other.assigned_memoffheap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1220,7 +1220,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       return lastComparison;
     }
     if (is_set_assigned_cpu()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.assigned_cpu, other.assigned_cpu);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1232,11 +1232,11 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
     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);
   }
 
@@ -1358,15 +1358,15 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
     return sb.toString();
   }
 
-  public void validate() throws org.apache.thrift.TException {
+  public void validate() throws org.apache.storm.thrift.TException {
     // check for required fields
     // check for sub-struct validity
   }
 
   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);
     }
   }
@@ -1375,82 +1375,82 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
     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 WorkerSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerSummaryStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerSummaryStandardScheme getScheme() {
       return new WorkerSummaryStandardScheme();
     }
   }
 
-  private static class WorkerSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerSummary> {
+  private static class WorkerSummaryStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerSummary> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerSummary struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerSummary 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: // SUPERVISOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.supervisor_id = iprot.readString();
               struct.set_supervisor_id_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: // HOST
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.host = iprot.readString();
               struct.set_host_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: // PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.port = iprot.readI32();
               struct.set_port_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: // TOPOLOGY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_id = iprot.readString();
               struct.set_topology_id_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: // TOPOLOGY_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.topology_name = iprot.readString();
               struct.set_topology_name_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: // NUM_EXECUTORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_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: // COMPONENT_TO_NUM_TASKS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map456 = iprot.readMapBegin();
+                org.apache.storm.thrift.protocol.TMap _map456 = iprot.readMapBegin();
                 struct.component_to_num_tasks = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map456.size);
                 java.lang.String _key457;
                 long _val458;
@@ -1464,75 +1464,75 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
               }
               struct.set_component_to_num_tasks_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: // TIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.time_secs = iprot.readI32();
               struct.set_time_secs_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: // UPTIME_SECS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 521: // REQUESTED_MEMONHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_memonheap = iprot.readDouble();
               struct.set_requested_memonheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 522: // REQUESTED_MEMOFFHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_memoffheap = iprot.readDouble();
               struct.set_requested_memoffheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 523: // REQUESTED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.requested_cpu = iprot.readDouble();
               struct.set_requested_cpu_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 524: // ASSIGNED_MEMONHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_memonheap = iprot.readDouble();
               struct.set_assigned_memonheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 525: // ASSIGNED_MEMOFFHEAP
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_memoffheap = iprot.readDouble();
               struct.set_assigned_memoffheap_isSet(true);
             } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
           case 526: // ASSIGNED_CPU
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.DOUBLE) {
               struct.assigned_cpu = iprot.readDouble();
               struct.set_assigned_cpu_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();
       }
@@ -1540,7 +1540,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerSummary struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerSummary struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -1586,7 +1586,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
         if (struct.is_set_component_to_num_tasks()) {
           oprot.writeFieldBegin(COMPONENT_TO_NUM_TASKS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.component_to_num_tasks.size()));
+            oprot.writeMapBegin(new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, struct.component_to_num_tasks.size()));
             for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter460 : struct.component_to_num_tasks.entrySet())
             {
               oprot.writeString(_iter460.getKey());
@@ -1643,17 +1643,17 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
 
   }
 
-  private static class WorkerSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerSummaryTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerSummaryTupleScheme getScheme() {
       return new WorkerSummaryTupleScheme();
     }
   }
 
-  private static class WorkerSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerSummary> {
+  private static class WorkerSummaryTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerSummary> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerSummary 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, WorkerSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet optionals = new java.util.BitSet();
       if (struct.is_set_supervisor_id()) {
         optionals.set(0);
@@ -1756,8 +1756,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerSummary 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, WorkerSummary struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       java.util.BitSet incoming = iprot.readBitSet(15);
       if (incoming.get(0)) {
         struct.supervisor_id = iprot.readString();
@@ -1785,7 +1785,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TMap _map462 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.storm.thrift.protocol.TMap _map462 = new org.apache.storm.thrift.protocol.TMap(org.apache.storm.thrift.protocol.TType.STRING, org.apache.storm.thrift.protocol.TType.I64, iprot.readI32());
           struct.component_to_num_tasks = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map462.size);
           java.lang.String _key463;
           long _val464;
@@ -1833,8 +1833,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor
     }
   }
 
-  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/WorkerToken.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java
index b578783..4bced80 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.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 WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerToken._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerToken> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerToken");
+public class WorkerToken implements org.apache.storm.thrift.TBase<WorkerToken, WorkerToken._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerToken> {
+  private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("WorkerToken");
 
-  private static final org.apache.thrift.protocol.TField SERVICE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("serviceType", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("info", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField SIGNATURE_FIELD_DESC = new org.apache.thrift.protocol.TField("signature", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.storm.thrift.protocol.TField SERVICE_TYPE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("serviceType", org.apache.storm.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.storm.thrift.protocol.TField INFO_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("info", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.storm.thrift.protocol.TField SIGNATURE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("signature", org.apache.storm.thrift.protocol.TType.STRING, (short)3);
 
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerTokenStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerTokenTupleSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerTokenStandardSchemeFactory();
+  private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerTokenTupleSchemeFactory();
 
   private WorkerTokenServiceType serviceType; // required
   private java.nio.ByteBuffer info; // required
   private java.nio.ByteBuffer signature; // 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 {
     /**
      * 
      * @see WorkerTokenServiceType
@@ -108,17 +108,17 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
   }
 
   // isset id assignments
-  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.SERVICE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("serviceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, WorkerTokenServiceType.class)));
-    tmpMap.put(_Fields.INFO, new org.apache.thrift.meta_data.FieldMetaData("info", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.SIGNATURE, new org.apache.thrift.meta_data.FieldMetaData("signature", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    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.SERVICE_TYPE, new org.apache.storm.thrift.meta_data.FieldMetaData("serviceType", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.EnumMetaData(org.apache.storm.thrift.protocol.TType.ENUM, WorkerTokenServiceType.class)));
+    tmpMap.put(_Fields.INFO, new org.apache.storm.thrift.meta_data.FieldMetaData("info", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.SIGNATURE, new org.apache.storm.thrift.meta_data.FieldMetaData("signature", org.apache.storm.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING        , true)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerToken.class, metaDataMap);
+    org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerToken.class, metaDataMap);
   }
 
   public WorkerToken() {
@@ -131,8 +131,8 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
   {
     this();
     this.serviceType = serviceType;
-    this.info = org.apache.thrift.TBaseHelper.copyBinary(info);
-    this.signature = org.apache.thrift.TBaseHelper.copyBinary(signature);
+    this.info = org.apache.storm.thrift.TBaseHelper.copyBinary(info);
+    this.signature = org.apache.storm.thrift.TBaseHelper.copyBinary(signature);
   }
 
   /**
@@ -143,10 +143,10 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
       this.serviceType = other.serviceType;
     }
     if (other.is_set_info()) {
-      this.info = org.apache.thrift.TBaseHelper.copyBinary(other.info);
+      this.info = org.apache.storm.thrift.TBaseHelper.copyBinary(other.info);
     }
     if (other.is_set_signature()) {
-      this.signature = org.apache.thrift.TBaseHelper.copyBinary(other.signature);
+      this.signature = org.apache.storm.thrift.TBaseHelper.copyBinary(other.signature);
     }
   }
 
@@ -193,12 +193,12 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
   }
 
   public byte[] get_info() {
-    set_info(org.apache.thrift.TBaseHelper.rightSize(info));
+    set_info(org.apache.storm.thrift.TBaseHelper.rightSize(info));
     return info == null ? null : info.array();
   }
 
   public java.nio.ByteBuffer buffer_for_info() {
-    return org.apache.thrift.TBaseHelper.copyBinary(info);
+    return org.apache.storm.thrift.TBaseHelper.copyBinary(info);
   }
 
   public void set_info(byte[] info) {
@@ -206,7 +206,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
   }
 
   public void set_info(java.nio.ByteBuffer info) {
-    this.info = org.apache.thrift.TBaseHelper.copyBinary(info);
+    this.info = org.apache.storm.thrift.TBaseHelper.copyBinary(info);
   }
 
   public void unset_info() {
@@ -225,12 +225,12 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
   }
 
   public byte[] get_signature() {
-    set_signature(org.apache.thrift.TBaseHelper.rightSize(signature));
+    set_signature(org.apache.storm.thrift.TBaseHelper.rightSize(signature));
     return signature == null ? null : signature.array();
   }
 
   public java.nio.ByteBuffer buffer_for_signature() {
-    return org.apache.thrift.TBaseHelper.copyBinary(signature);
+    return org.apache.storm.thrift.TBaseHelper.copyBinary(signature);
   }
 
   public void set_signature(byte[] signature) {
@@ -238,7 +238,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
   }
 
   public void set_signature(java.nio.ByteBuffer signature) {
-    this.signature = org.apache.thrift.TBaseHelper.copyBinary(signature);
+    this.signature = org.apache.storm.thrift.TBaseHelper.copyBinary(signature);
   }
 
   public void unset_signature() {
@@ -402,7 +402,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
       return lastComparison;
     }
     if (is_set_serviceType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serviceType, other.serviceType);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.serviceType, other.serviceType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -412,7 +412,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
       return lastComparison;
     }
     if (is_set_info()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.info, other.info);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.info, other.info);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -422,7 +422,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
       return lastComparison;
     }
     if (is_set_signature()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.signature, other.signature);
+      lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.signature, other.signature);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -434,11 +434,11 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
     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);
   }
 
@@ -459,7 +459,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
     if (this.info == null) {
       sb.append("null");
     } else {
-      org.apache.thrift.TBaseHelper.toString(this.info, sb);
+      org.apache.storm.thrift.TBaseHelper.toString(this.info, sb);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -467,25 +467,25 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
     if (this.signature == null) {
       sb.append("null");
     } else {
-      org.apache.thrift.TBaseHelper.toString(this.signature, sb);
+      org.apache.storm.thrift.TBaseHelper.toString(this.signature, sb);
     }
     first = false;
     sb.append(")");
     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_serviceType()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'serviceType' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'serviceType' is unset! Struct:" + toString());
     }
 
     if (!is_set_info()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'info' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'info' is unset! Struct:" + toString());
     }
 
     if (!is_set_signature()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'signature' is unset! Struct:" + toString());
+      throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'signature' is unset! Struct:" + toString());
     }
 
     // check for sub-struct validity
@@ -493,64 +493,64 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
 
   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 WorkerTokenStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerTokenStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerTokenStandardScheme getScheme() {
       return new WorkerTokenStandardScheme();
     }
   }
 
-  private static class WorkerTokenStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerToken> {
+  private static class WorkerTokenStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<WorkerToken> {
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerToken struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
+    public void read(org.apache.storm.thrift.protocol.TProtocol iprot, WorkerToken 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: // SERVICE_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.I32) {
               struct.serviceType = org.apache.storm.generated.WorkerTokenServiceType.findByValue(iprot.readI32());
               struct.set_serviceType_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: // INFO
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.info = iprot.readBinary();
               struct.set_info_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: // SIGNATURE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+            if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
               struct.signature = iprot.readBinary();
               struct.set_signature_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();
       }
@@ -558,7 +558,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
       struct.validate();
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerToken struct) throws org.apache.thrift.TException {
+    public void write(org.apache.storm.thrift.protocol.TProtocol oprot, WorkerToken struct) throws org.apache.storm.thrift.TException {
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
@@ -583,25 +583,25 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
 
   }
 
-  private static class WorkerTokenTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+  private static class WorkerTokenTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
     public WorkerTokenTupleScheme getScheme() {
       return new WorkerTokenTupleScheme();
     }
   }
 
-  private static class WorkerTokenTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerToken> {
+  private static class WorkerTokenTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<WorkerToken> {
 
     @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkerToken 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, WorkerToken struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       oprot.writeI32(struct.serviceType.getValue());
       oprot.writeBinary(struct.info);
       oprot.writeBinary(struct.signature);
     }
 
     @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkerToken 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, WorkerToken struct) throws org.apache.storm.thrift.TException {
+      org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
       struct.serviceType = org.apache.storm.generated.WorkerTokenServiceType.findByValue(iprot.readI32());
       struct.set_serviceType_isSet(true);
       struct.info = iprot.readBinary();
@@ -611,8 +611,8 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT
     }
   }
 
-  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();
   }
 }
 


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

Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
index d46741b..117259b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/DistributedRPC.java
@@ -29,43 +29,43 @@ public class DistributedRPC {
 
   public interface Iface {
 
-    public java.lang.String execute(java.lang.String functionName, java.lang.String funcArgs) throws DRPCExecutionException, AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String execute(java.lang.String functionName, java.lang.String funcArgs) throws DRPCExecutionException, AuthorizationException, org.apache.storm.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void execute(java.lang.String functionName, java.lang.String funcArgs, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void execute(java.lang.String functionName, java.lang.String funcArgs, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
-    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
+  public static class Client extends org.apache.storm.thrift.TServiceClient implements Iface {
+    public static class Factory implements org.apache.storm.thrift.TServiceClientFactory<Client> {
       public Factory() {}
-      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol prot) {
         return new Client(prot);
       }
-      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+      public Client getClient(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
         return new Client(iprot, oprot);
       }
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol prot)
+    public Client(org.apache.storm.thrift.protocol.TProtocol prot)
     {
       super(prot, prot);
     }
 
-    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
+    public Client(org.apache.storm.thrift.protocol.TProtocol iprot, org.apache.storm.thrift.protocol.TProtocol oprot) {
       super(iprot, oprot);
     }
 
-    public java.lang.String execute(java.lang.String functionName, java.lang.String funcArgs) throws DRPCExecutionException, AuthorizationException, org.apache.thrift.TException
+    public java.lang.String execute(java.lang.String functionName, java.lang.String funcArgs) throws DRPCExecutionException, AuthorizationException, org.apache.storm.thrift.TException
     {
       send_execute(functionName, funcArgs);
       return recv_execute();
     }
 
-    public void send_execute(java.lang.String functionName, java.lang.String funcArgs) throws org.apache.thrift.TException
+    public void send_execute(java.lang.String functionName, java.lang.String funcArgs) throws org.apache.storm.thrift.TException
     {
       execute_args args = new execute_args();
       args.set_functionName(functionName);
@@ -73,7 +73,7 @@ public class DistributedRPC {
       sendBase("execute", args);
     }
 
-    public java.lang.String recv_execute() throws DRPCExecutionException, AuthorizationException, org.apache.thrift.TException
+    public java.lang.String recv_execute() throws DRPCExecutionException, AuthorizationException, org.apache.storm.thrift.TException
     {
       execute_result result = new execute_result();
       receiveBase(result, "execute");
@@ -86,45 +86,45 @@ public class DistributedRPC {
       if (result.aze != null) {
         throw result.aze;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "execute failed: unknown result");
+      throw new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.MISSING_RESULT, "execute failed: unknown result");
     }
 
   }
-  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
-    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
-      private org.apache.thrift.async.TAsyncClientManager clientManager;
-      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
-      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+  public static class AsyncClient extends org.apache.storm.thrift.async.TAsyncClient implements AsyncIface {
+    public static class Factory implements org.apache.storm.thrift.async.TAsyncClientFactory<AsyncClient> {
+      private org.apache.storm.thrift.async.TAsyncClientManager clientManager;
+      private org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory;
+      public Factory(org.apache.storm.thrift.async.TAsyncClientManager clientManager, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory) {
         this.clientManager = clientManager;
         this.protocolFactory = protocolFactory;
       }
-      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
+      public AsyncClient getAsyncClient(org.apache.storm.thrift.transport.TNonblockingTransport transport) {
         return new AsyncClient(protocolFactory, clientManager, transport);
       }
     }
 
-    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
+    public AsyncClient(org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.async.TAsyncClientManager clientManager, org.apache.storm.thrift.transport.TNonblockingTransport transport) {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void execute(java.lang.String functionName, java.lang.String funcArgs, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+    public void execute(java.lang.String functionName, java.lang.String funcArgs, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException {
       checkReady();
       execute_call method_call = new execute_call(functionName, funcArgs, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class execute_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+    public static class execute_call extends org.apache.storm.thrift.async.TAsyncMethodCall<java.lang.String> {
       private java.lang.String functionName;
       private java.lang.String funcArgs;
-      public execute_call(java.lang.String functionName, java.lang.String funcArgs, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public execute_call(java.lang.String functionName, java.lang.String funcArgs, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.storm.thrift.async.TAsyncClient client, org.apache.storm.thrift.protocol.TProtocolFactory protocolFactory, org.apache.storm.thrift.transport.TNonblockingTransport transport) throws org.apache.storm.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.functionName = functionName;
         this.funcArgs = funcArgs;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute", org.apache.thrift.protocol.TMessageType.CALL, 0));
+      public void write_args(org.apache.storm.thrift.protocol.TProtocol prot) throws org.apache.storm.thrift.TException {
+        prot.writeMessageBegin(new org.apache.storm.thrift.protocol.TMessage("execute", org.apache.storm.thrift.protocol.TMessageType.CALL, 0));
         execute_args args = new execute_args();
         args.set_functionName(functionName);
         args.set_funcArgs(funcArgs);
@@ -132,34 +132,34 @@ public class DistributedRPC {
         prot.writeMessageEnd();
       }
 
-      public java.lang.String getResult() throws DRPCExecutionException, AuthorizationException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public java.lang.String getResult() throws DRPCExecutionException, AuthorizationException, org.apache.storm.thrift.TException {
+        if (getState() != org.apache.storm.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        org.apache.storm.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.storm.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.storm.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
         return (new Client(prot)).recv_execute();
       }
     }
 
   }
 
-  public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
+  public static class Processor<I extends Iface> extends org.apache.storm.thrift.TBaseProcessor<I> implements org.apache.storm.thrift.TProcessor {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.storm.thrift.ProcessFunction<I, ? extends org.apache.storm.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.storm.thrift.ProcessFunction<I, ? extends  org.apache.storm.thrift.TBase>> processMap) {
       processMap.put("execute", new execute());
       return processMap;
     }
 
-    public static class execute<I extends Iface> extends org.apache.thrift.ProcessFunction<I, execute_args> {
+    public static class execute<I extends Iface> extends org.apache.storm.thrift.ProcessFunction<I, execute_args> {
       public execute() {
         super("execute");
       }
@@ -177,7 +177,7 @@ public class DistributedRPC {
         return false;
       }
 
-      public execute_result getResult(I iface, execute_args args) throws org.apache.thrift.TException {
+      public execute_result getResult(I iface, execute_args args) throws org.apache.storm.thrift.TException {
         execute_result result = new execute_result();
         try {
           result.success = iface.execute(args.functionName, args.funcArgs);
@@ -192,22 +192,22 @@ public class DistributedRPC {
 
   }
 
-  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.storm.thrift.TBaseAsyncProcessor<I> {
     private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.storm.thrift.AsyncProcessFunction<I, ? extends org.apache.storm.thrift.TBase, ?>>()));
     }
 
-    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase, ?>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.storm.thrift.AsyncProcessFunction<I, ? extends  org.apache.storm.thrift.TBase, ?>> processMap) {
       processMap.put("execute", new execute());
       return processMap;
     }
 
-    public static class execute<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, execute_args, java.lang.String> {
+    public static class execute<I extends AsyncIface> extends org.apache.storm.thrift.AsyncProcessFunction<I, execute_args, java.lang.String> {
       public execute() {
         super("execute");
       }
@@ -216,15 +216,15 @@ public class DistributedRPC {
         return new execute_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+      public org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.storm.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.storm.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String>() { 
           public void onComplete(java.lang.String o) {
             execute_result result = new execute_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
+              fcall.sendResponse(fb, result, org.apache.storm.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.storm.thrift.transport.TTransportException e) {
               _LOGGER.error("TTransportException writing to internal frame buffer", e);
               fb.close();
             } catch (java.lang.Exception e) {
@@ -233,8 +233,8 @@ public class DistributedRPC {
             }
           }
           public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
+            byte msgType = org.apache.storm.thrift.protocol.TMessageType.REPLY;
+            org.apache.storm.thrift.TSerializable msg;
             execute_result result = new execute_result();
             if (e instanceof DRPCExecutionException) {
               result.e = (DRPCExecutionException) e;
@@ -244,18 +244,18 @@ public class DistributedRPC {
               result.aze = (AuthorizationException) e;
               result.set_aze_isSet(true);
               msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+            } else if (e instanceof org.apache.storm.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
               return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
+            } else if (e instanceof org.apache.storm.thrift.TApplicationException) {
               _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.storm.thrift.TApplicationException)e;
             } else {
               _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msgType = org.apache.storm.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.storm.thrift.TApplicationException(org.apache.storm.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
@@ -271,27 +271,27 @@ public class DistributedRPC {
         return false;
       }
 
-      public void start(I iface, execute_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+      public void start(I iface, execute_args args, org.apache.storm.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.storm.thrift.TException {
         iface.execute(args.functionName, args.funcArgs,resultHandler);
       }
     }
 
   }
 
-  public static class execute_args implements org.apache.thrift.TBase<execute_args, execute_args._Fields>, java.io.Serializable, Cloneable, Comparable<execute_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execute_args");
+  public static class execute_args implements org.apache.storm.thrift.TBase<execute_args, execute_args._Fields>, java.io.Serializable, Cloneable, Comparable<execute_args>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("execute_args");
 
-    private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("funcArgs", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.storm.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("functionName", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("funcArgs", org.apache.storm.thrift.protocol.TType.STRING, (short)2);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new execute_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new execute_argsTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new execute_argsStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new execute_argsTupleSchemeFactory();
 
     private java.lang.String functionName; // required
     private java.lang.String funcArgs; // 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 {
       FUNCTION_NAME((short)1, "functionName"),
       FUNC_ARGS((short)2, "funcArgs");
 
@@ -352,15 +352,15 @@ public class DistributedRPC {
     }
 
     // isset id assignments
-    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.FUNCTION_NAME, new org.apache.thrift.meta_data.FieldMetaData("functionName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.FUNC_ARGS, new org.apache.thrift.meta_data.FieldMetaData("funcArgs", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      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.FUNCTION_NAME, new org.apache.storm.thrift.meta_data.FieldMetaData("functionName", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.FUNC_ARGS, new org.apache.storm.thrift.meta_data.FieldMetaData("funcArgs", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_args.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_args.class, metaDataMap);
     }
 
     public execute_args() {
@@ -555,7 +555,7 @@ public class DistributedRPC {
         return lastComparison;
       }
       if (is_set_functionName()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -565,7 +565,7 @@ public class DistributedRPC {
         return lastComparison;
       }
       if (is_set_funcArgs()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.funcArgs, other.funcArgs);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.funcArgs, other.funcArgs);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -577,11 +577,11 @@ public class DistributedRPC {
       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);
     }
 
@@ -609,63 +609,63 @@ public class DistributedRPC {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 execute_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class execute_argsStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public execute_argsStandardScheme getScheme() {
         return new execute_argsStandardScheme();
       }
     }
 
-    private static class execute_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<execute_args> {
+    private static class execute_argsStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<execute_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, execute_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, execute_args 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: // FUNCTION_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.functionName = iprot.readString();
                 struct.set_functionName_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: // FUNC_ARGS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.funcArgs = iprot.readString();
                 struct.set_funcArgs_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();
         }
@@ -673,7 +673,7 @@ public class DistributedRPC {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, execute_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, execute_args struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -693,17 +693,17 @@ public class DistributedRPC {
 
     }
 
-    private static class execute_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class execute_argsTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public execute_argsTupleScheme getScheme() {
         return new execute_argsTupleScheme();
       }
     }
 
-    private static class execute_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<execute_args> {
+    private static class execute_argsTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<execute_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, execute_args 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, execute_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_functionName()) {
           optionals.set(0);
@@ -721,8 +721,8 @@ public class DistributedRPC {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, execute_args 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, execute_args struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.functionName = iprot.readString();
@@ -735,27 +735,27 @@ public class DistributedRPC {
       }
     }
 
-    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();
     }
   }
 
-  public static class execute_result implements org.apache.thrift.TBase<execute_result, execute_result._Fields>, java.io.Serializable, Cloneable, Comparable<execute_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execute_result");
+  public static class execute_result implements org.apache.storm.thrift.TBase<execute_result, execute_result._Fields>, java.io.Serializable, Cloneable, Comparable<execute_result>   {
+    private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("execute_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
-    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.storm.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("success", org.apache.storm.thrift.protocol.TType.STRING, (short)0);
+    private static final org.apache.storm.thrift.protocol.TField E_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("e", org.apache.storm.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.storm.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("aze", org.apache.storm.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new execute_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new execute_resultTupleSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new execute_resultStandardSchemeFactory();
+    private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new execute_resultTupleSchemeFactory();
 
     private java.lang.String success; // required
     private DRPCExecutionException e; // required
     private AuthorizationException aze; // 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 {
       SUCCESS((short)0, "success"),
       E((short)1, "e"),
       AZE((short)2, "aze");
@@ -819,17 +819,17 @@ public class DistributedRPC {
     }
 
     // isset id assignments
-    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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DRPCExecutionException.class)));
-      tmpMap.put(_Fields.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AuthorizationException.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.SUCCESS, new org.apache.storm.thrift.meta_data.FieldMetaData("success", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.E, new org.apache.storm.thrift.meta_data.FieldMetaData("e", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, DRPCExecutionException.class)));
+      tmpMap.put(_Fields.AZE, new org.apache.storm.thrift.meta_data.FieldMetaData("aze", org.apache.storm.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.storm.thrift.meta_data.StructMetaData(org.apache.storm.thrift.protocol.TType.STRUCT, AuthorizationException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_result.class, metaDataMap);
+      org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_result.class, metaDataMap);
     }
 
     public execute_result() {
@@ -1079,7 +1079,7 @@ public class DistributedRPC {
         return lastComparison;
       }
       if (is_set_success()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1089,7 +1089,7 @@ public class DistributedRPC {
         return lastComparison;
       }
       if (is_set_e()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, other.e);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.e, other.e);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1099,7 +1099,7 @@ public class DistributedRPC {
         return lastComparison;
       }
       if (is_set_aze()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
+        lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.aze, other.aze);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1111,11 +1111,11 @@ public class DistributedRPC {
       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);
       }
 
@@ -1151,73 +1151,73 @@ public class DistributedRPC {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws org.apache.storm.thrift.TException {
       // check for required fields
       // check for sub-struct validity
     }
 
     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 execute_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class execute_resultStandardSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public execute_resultStandardScheme getScheme() {
         return new execute_resultStandardScheme();
       }
     }
 
-    private static class execute_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<execute_result> {
+    private static class execute_resultStandardScheme extends org.apache.storm.thrift.scheme.StandardScheme<execute_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, execute_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
+      public void read(org.apache.storm.thrift.protocol.TProtocol iprot, execute_result 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 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
                 struct.success = iprot.readString();
                 struct.set_success_isSet(true);
               } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+                org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
             case 1: // E
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
                 struct.e = new DRPCExecutionException();
                 struct.e.read(iprot);
                 struct.set_e_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: // AZE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRUCT) {
                 struct.aze = new AuthorizationException();
                 struct.aze.read(iprot);
                 struct.set_aze_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();
         }
@@ -1225,7 +1225,7 @@ public class DistributedRPC {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, execute_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.storm.thrift.protocol.TProtocol oprot, execute_result struct) throws org.apache.storm.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1250,17 +1250,17 @@ public class DistributedRPC {
 
     }
 
-    private static class execute_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class execute_resultTupleSchemeFactory implements org.apache.storm.thrift.scheme.SchemeFactory {
       public execute_resultTupleScheme getScheme() {
         return new execute_resultTupleScheme();
       }
     }
 
-    private static class execute_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<execute_result> {
+    private static class execute_resultTupleScheme extends org.apache.storm.thrift.scheme.TupleScheme<execute_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, execute_result 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, execute_result struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.is_set_success()) {
           optionals.set(0);
@@ -1284,8 +1284,8 @@ public class DistributedRPC {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, execute_result 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, execute_result struct) throws org.apache.storm.thrift.TException {
+        org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = iprot.readString();
@@ -1304,8 +1304,8 @@ public class DistributedRPC {
       }
     }
 
-    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();
     }
   }