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

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

http://git-wip-us.apache.org/repos/asf/storm/blob/91251c54/storm-client/src/jvm/org/apache/storm/generated/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();
   }
 }