djcoder100
diff --git a/‎project.clj
+1-1 b/‎project.clj
+1-1
diff --git a/‎src/clj/backtype/storm/daemon/drpc.clj
+4-4 b/‎src/clj/backtype/storm/daemon/drpc.clj
+4-4
diff --git a/‎src/clj/backtype/storm/daemon/nimbus.clj
+4-4 b/‎src/clj/backtype/storm/daemon/nimbus.clj
+4-4
diff --git a/‎src/clj/backtype/storm/thrift.clj
+2-2 b/‎src/clj/backtype/storm/thrift.clj
+2-2
diff --git a/‎src/jvm/backtype/storm/StormSubmitter.java
+1-1 b/‎src/jvm/backtype/storm/StormSubmitter.java
+1-1
diff --git a/‎src/jvm/backtype/storm/drpc/ReturnResults.java
+1-1 b/‎src/jvm/backtype/storm/drpc/ReturnResults.java
+1-1
diff --git a/‎src/jvm/backtype/storm/generated/AlreadyAliveException.java
+23-23 b/‎src/jvm/backtype/storm/generated/AlreadyAliveException.java
+23-23
@@ -10,7 +10,7 @@
                  [commons-io "1.4"]
                  [org.apache.commons/commons-exec "1.1"]
                  [jvyaml "1.0.0"]
-                 [org.apache.thrift/libthrift "0.7.0"]
+                 [storm/libthrift7 "0.7.0"]
                  [clj-time "0.3.0"]
                  [log4j/log4j "1.2.16"]
                  [org.apache.zookeeper/zookeeper "3.3.2"]
 
@@ -1,8 +1,8 @@
 (ns backtype.storm.daemon.drpc
-  (:import [org.apache.thrift.server THsHaServer THsHaServer$Args])
-  (:import [org.apache.thrift.protocol TBinaryProtocol TBinaryProtocol$Factory])
-  (:import [org.apache.thrift TException])
-  (:import [org.apache.thrift.transport TNonblockingServerTransport TNonblockingServerSocket])
+  (:import [org.apache.thrift7.server THsHaServer THsHaServer$Args])
+  (:import [org.apache.thrift7.protocol TBinaryProtocol TBinaryProtocol$Factory])
+  (:import [org.apache.thrift7 TException])
+  (:import [org.apache.thrift7.transport TNonblockingServerTransport TNonblockingServerSocket])
   (:import [backtype.storm.generated DistributedRPC DistributedRPC$Iface DistributedRPC$Processor])
   (:import [java.util.concurrent Semaphore])
   (:import [backtype.storm.drpc SpoutAdder])
 
@@ -1,8 +1,8 @@
 (ns backtype.storm.daemon.nimbus
-  (:import [org.apache.thrift.server THsHaServer THsHaServer$Args])
-  (:import [org.apache.thrift.protocol TBinaryProtocol TBinaryProtocol$Factory])
-  (:import [org.apache.thrift TException])
-  (:import [org.apache.thrift.transport TNonblockingServerTransport TNonblockingServerSocket])
+  (:import [org.apache.thrift7.server THsHaServer THsHaServer$Args])
+  (:import [org.apache.thrift7.protocol TBinaryProtocol TBinaryProtocol$Factory])
+  (:import [org.apache.thrift7 TException])
+  (:import [org.apache.thrift7.transport TNonblockingServerTransport TNonblockingServerSocket])
   (:import [java.nio ByteBuffer])
   (:import [java.nio.channels Channels WritableByteChannel])
   (:use [backtype.storm bootstrap])
 
@@ -4,8 +4,8 @@
   (:import [backtype.storm Constants])
   (:import [backtype.storm.task CoordinatedBolt CoordinatedBolt$SourceArgs])
   (:import [backtype.storm.topology OutputFieldsGetter IBasicBolt BasicBoltExecutor])
-  (:import [org.apache.thrift.protocol TBinaryProtocol TProtocol])
-  (:import [org.apache.thrift.transport TTransport TFramedTransport TSocket])
+  (:import [org.apache.thrift7.protocol TBinaryProtocol TProtocol])
+  (:import [org.apache.thrift7.transport TTransport TFramedTransport TSocket])
   (:use [backtype.storm util])
   (:use [clojure.contrib.def :only [defnk]])
   )
 
@@ -10,7 +10,7 @@
 import java.nio.ByteBuffer;
 import java.util.Map;
 import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
+import org.apache.thrift7.TException;
 import org.json.simple.JSONValue;
 
 /**
 
@@ -7,7 +7,7 @@
 import backtype.storm.tuple.Tuple;
 import backtype.storm.utils.DRPCClient;
 import java.util.Map;
-import org.apache.thrift.TException;
+import org.apache.thrift7.TException;
 import org.json.simple.JSONValue;