Release 0.9.6.1

alibaba · Oct 11, 2014 · 18638be · 18638be
1 parent 86bf393
commit 18638be
Show file tree

Hide file tree

Showing 143 changed files with 2,291 additions and 1,789 deletions.
diff --git a/LICENSE.html b/LICENSE.html
diff --git a/README.md b/README.md
diff --git a/example/sequence-split-merge/pom.xml b/example/sequence-split-merge/pom.xml
@@ -11,7 +11,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jstorm.version>0.9.4.1</jstorm.version>
+		<jstorm.version>0.9.6</jstorm.version>
 		<storm.version>storm-0.9.2-incubating</storm.version>
 	</properties>
 	<repositories>
@@ -89,7 +89,7 @@
 					</descriptorRefs>
 					<archive>
 						<manifest>
-							<mainClass>storm.starter.SequenceTopology</mainClass>
+							<mainClass>com.alipay.dw.jstorm.example.sequence.SequenceTopology</mainClass>
 						</manifest>
 					</archive>
 				</configuration>

diff --git a/...nce-split-merge/src/main/java/com/alipay/dw/jstorm/example/batch/SimpleBatchTopology.java b/...nce-split-merge/src/main/java/com/alipay/dw/jstorm/example/batch/SimpleBatchTopology.java
@@ -8,6 +8,7 @@
 import org.yaml.snakeyaml.Yaml;
 
 import backtype.storm.Config;
+import backtype.storm.LocalCluster;
 import backtype.storm.StormSubmitter;
 import backtype.storm.generated.AlreadyAliveException;
 import backtype.storm.generated.InvalidTopologyException;
@@ -17,7 +18,6 @@
 
 import com.alibaba.jstorm.batch.BatchTopologyBuilder;
 import com.alibaba.jstorm.cluster.StormConfig;
-import com.alibaba.jstorm.local.LocalCluster;
 import com.alibaba.jstorm.utils.JStormUtils;
 
 public class SimpleBatchTopology {

diff --git a/...e/sequence-split-merge/src/main/java/com/alipay/dw/jstorm/example/drpc/ReachTopology.java b/...e/sequence-split-merge/src/main/java/com/alipay/dw/jstorm/example/drpc/ReachTopology.java
@@ -1,29 +1,27 @@
 package com.alipay.dw.jstorm.example.drpc;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import backtype.storm.Config;
+import backtype.storm.LocalCluster;
+import backtype.storm.LocalDRPC;
 import backtype.storm.StormSubmitter;
 import backtype.storm.coordination.BatchOutputCollector;
-import backtype.storm.coordination.CoordinatedBolt.FinishedCallback;
 import backtype.storm.drpc.LinearDRPCTopologyBuilder;
-import backtype.storm.task.OutputCollector;
 import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.BasicOutputCollector;
-import backtype.storm.topology.IRichBolt;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseBasicBolt;
 import backtype.storm.topology.base.BaseBatchBolt;
 import backtype.storm.tuple.Fields;
 import backtype.storm.tuple.Tuple;
 import backtype.storm.tuple.Values;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
-import com.alibaba.jstorm.local.LocalCluster;
-import com.alibaba.jstorm.local.LocalDRPC;
 import com.alibaba.jstorm.utils.JStormUtils;
 
 /**

diff --git a/...nce-split-merge/src/main/java/com/alipay/dw/jstorm/example/sequence/SequenceTopology.java b/...nce-split-merge/src/main/java/com/alipay/dw/jstorm/example/sequence/SequenceTopology.java
@@ -7,10 +7,10 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.thrift7.server.THsHaServer.Args;
 import org.yaml.snakeyaml.Yaml;
 
 import backtype.storm.Config;
+import backtype.storm.LocalCluster;
 import backtype.storm.StormSubmitter;
 import backtype.storm.generated.AlreadyAliveException;
 import backtype.storm.generated.InvalidTopologyException;
@@ -19,8 +19,6 @@
 import backtype.storm.topology.TopologyBuilder;
 import backtype.storm.tuple.Fields;
 
-import com.alibaba.jstorm.cluster.StormConfig;
-import com.alibaba.jstorm.local.LocalCluster;
 import com.alibaba.jstorm.utils.JStormUtils;
 import com.alipay.dw.jstorm.example.sequence.bean.Pair;
 import com.alipay.dw.jstorm.example.sequence.bean.TradeCustomer;

diff --git a/...split-merge/src/main/java/com/alipay/dw/jstorm/example/sequence/SequenceTopologyTool.java b/...split-merge/src/main/java/com/alipay/dw/jstorm/example/sequence/SequenceTopologyTool.java
@@ -1,32 +1,18 @@
 package com.alipay.dw.jstorm.example.sequence;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
 import backtype.storm.Config;
+import backtype.storm.LocalCluster;
 import backtype.storm.StormSubmitter;
-import backtype.storm.drpc.LinearDRPCTopologyBuilder;
+import backtype.storm.Tool;
+import backtype.storm.ToolRunner;
 import backtype.storm.generated.AlreadyAliveException;
 import backtype.storm.generated.InvalidTopologyException;
+import backtype.storm.generated.StormTopology;
 import backtype.storm.generated.TopologyAssignException;
 import backtype.storm.topology.TopologyBuilder;
 import backtype.storm.tuple.Fields;
 
-import com.alibaba.jstorm.local.LocalCluster;
 import com.alibaba.jstorm.utils.JStormUtils;
-
-
-import backtype.storm.Config;
-import backtype.storm.Tool;
-import backtype.storm.ToolRunner;
-import backtype.storm.topology.TopologyBuilder;
-import backtype.storm.tuple.Fields;
-import backtype.storm.generated.StormTopology;
-
 import com.alipay.dw.jstorm.example.sequence.bean.Pair;
 import com.alipay.dw.jstorm.example.sequence.bean.TradeCustomer;
 import com.alipay.dw.jstorm.example.sequence.bolt.MergeRecord;