Merge branch 'master' of github.com:PeterPan-luo/StormDemo

Author: PeterPan-luo

pom.xml

@@ -47,7 +47,13 @@
 				<artifactId>log4j</artifactId>
 			</exclusion>
 		</exclusions>
+	
 	</dependency>
+	<dependency>
+			<groupId>org.apache.kafka</groupId>
+			<artifactId>kafka-clients</artifactId>
+			<version>0.8.2.2</version>
+		</dependency>
 	<!-- log jar -->
 	<dependency>
 		<groupId>org.slf4j</groupId>

src/main/java/com/storm/hbase/HBaseAggregateFactory.java

@@ -1,7 +1,5 @@
 package com.storm.hbase;
 
-import hbase.state.TridentConfig;
-
 import java.util.Map;
 
 import org.apache.storm.task.IMetricsContext;
@@ -30,7 +28,7 @@ public HBaseAggregateFactory(TridentConfig config,StateType stateType){
 		this.type = stateType;
 		this.config = config;
 		if (config.getStateSerializer() == null) {
-			config.setStateSerializer(TridentConfig.DEFAULT_SERIALIZES.get(type));
+			config.setStateSerializer(TridentConfig.DEFAULT_SERIALIZERS.get(type));
 		}
 	}
 

src/main/java/com/storm/log/stats/KafkaSpout.java

@@ -5,11 +5,16 @@
 import java.util.Map;
 import java.util.Properties;
 
+import kafka.consumer.Consumer;
+import kafka.consumer.ConsumerConfig;
+import kafka.consumer.ConsumerIterator;
+import kafka.consumer.KafkaStream;
+import kafka.javaapi.consumer.ConsumerConnector;
+
 import org.apache.storm.spout.SpoutOutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.IRichSpout;
 import org.apache.storm.topology.OutputFieldsDeclarer;
-import org.apache.storm.trident.operation.Consumer;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.tuple.Values;
 import org.slf4j.Logger;