Apache Storm version 1.0.0 used

examples/src/main/java/org/apache/storm/jms/example/ExampleJmsTopology.java

@@ -22,18 +22,18 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import backtype.storm.Config;
-import backtype.storm.LocalCluster;
-import backtype.storm.StormSubmitter;
+import org.apache.storm.Config;
+import org.apache.storm.LocalCluster;
+import org.apache.storm.StormSubmitter;
 import org.apache.storm.jms.JmsMessageProducer;
 import org.apache.storm.jms.JmsProvider;
 import org.apache.storm.jms.JmsTupleProducer;
 import org.apache.storm.jms.bolt.JmsBolt;
 import org.apache.storm.jms.spout.JmsSpout;
-import backtype.storm.topology.TopologyBuilder;
-import backtype.storm.tuple.Fields;
-import backtype.storm.tuple.Tuple;
-import backtype.storm.utils.Utils;
+import org.apache.storm.topology.TopologyBuilder;
+import org.apache.storm.tuple.Fields;
+import org.apache.storm.tuple.Tuple;
+import org.apache.storm.utils.Utils;
 
 public class ExampleJmsTopology {
 	public static final String JMS_QUEUE_SPOUT = "JMS_QUEUE_SPOUT";

examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java

@@ -19,21 +19,21 @@
 
 import java.util.Map;
 
-import backtype.storm.topology.base.BaseRichBolt;
+import org.apache.storm.topology.base.BaseRichBolt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import backtype.storm.task.OutputCollector;
-import backtype.storm.task.TopologyContext;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.tuple.Fields;
-import backtype.storm.tuple.Tuple;
+import org.apache.storm.task.OutputCollector;
+import org.apache.storm.task.TopologyContext;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.tuple.Fields;
+import org.apache.storm.tuple.Tuple;
 /**
- * A generic <code>backtype.storm.topology.IRichBolt</code> implementation
+ * A generic <code>org.apache.storm.topology.IRichBolt</code> implementation
  * for testing/debugging the Storm JMS Spout and example topologies.
  * <p/>
  * For debugging purposes, set the log level of the 
- * <code>backtype.storm.contrib.jms</code> package to DEBUG for debugging
+ * <code>org.apache.storm.contrib.jms</code> package to DEBUG for debugging
  * output.
  * @author tgoetz
  *

examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java

@@ -22,9 +22,9 @@
 import javax.jms.TextMessage;
 
 import org.apache.storm.jms.JmsTupleProducer;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.tuple.Fields;
-import backtype.storm.tuple.Values;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.tuple.Fields;
+import org.apache.storm.tuple.Values;
 
 /**
  * A simple <code>JmsTupleProducer</code> that expects to receive

examples/src/main/resources/jms-activemq.xml

@@ -31,9 +31,9 @@
 		</amq:transportConnectors>
 	</amq:broker> -->
 
-	<amq:queue id="notificationQueue" physicalName="backtype.storm.contrib.example.queue" />
+	<amq:queue id="notificationQueue" physicalName="org.apache.storm.contrib.example.queue" />
 
-	<amq:topic id="notificationTopic" physicalName="backtype.storm.contrib.example.topic" />
+	<amq:topic id="notificationTopic" physicalName="org.apache.storm.contrib.example.topic" />
 
 	<amq:connectionFactory id="jmsConnectionFactory"
 		brokerURL="tcp://localhost:61616" />

examples/src/main/resources/log4j.properties

@@ -22,7 +22,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%5p (%C:%L) - %m%n
 
 
-log4j.logger.backtype.storm.contrib=DEBUG
+log4j.logger.org.apache.storm.contrib=DEBUG
 log4j.logger.clojure.contrib=WARN
 log4j.logger.org.springframework=WARN
 log4j.logger.org.apache.zookeeper=WARN

pom.xml

@@ -27,7 +27,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.ptgoetz</groupId>
 	<artifactId>storm-jms</artifactId>
-	<version>0.9.2-SNAPSHOT</version>
+	<version>1.0.0</version>
 	<name>Storm JMS</name>
 	<description>Storm JMS Components</description>
 
@@ -61,8 +61,9 @@
 
 
 	<properties>
-		<storm.version>0.9.3</storm.version>
+		<storm.version>1.0.0</storm.version>
 	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.storm</groupId>
@@ -82,6 +83,12 @@
 			<version>4.10</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.1.26</version>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- Active MQ -->
 		<dependency>

src/main/java/org/apache/storm/jms/JmsMessageProducer.java

@@ -6,11 +6,11 @@
 import javax.jms.Message;
 import javax.jms.Session;
 
-import backtype.storm.tuple.Tuple;
-import backtype.storm.tuple.Values;
+import org.apache.storm.tuple.Tuple;
+import org.apache.storm.tuple.Values;
 /**
  * JmsMessageProducer implementations are responsible for translating
- * a <code>backtype.storm.tuple.Values</code> instance into a 
+ * a <code>org.apache.storm.tuple.Values</code> instance into a
  * <code>javax.jms.Message</code> object.
  * <p/>
  * 
@@ -21,7 +21,7 @@
 public interface JmsMessageProducer extends Serializable{
 
 	/**
-	 * Translate a <code>backtype.storm.tuple.Tuple</code> object
+	 * Translate a <code>org.apache.storm.tuple.Tuple</code> object
 	 * to a <code>javax.jms.Message</code object.
 	 * 
 	 * @param session

src/main/java/org/apache/storm/jms/JmsTupleProducer.java

@@ -5,8 +5,8 @@
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.tuple.Values;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.tuple.Values;
 
 /**
  * Interface to define classes that can produce a Storm <code>Values</code> objects

src/main/java/org/apache/storm/jms/bolt/JmsBolt.java

@@ -10,19 +10,19 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import backtype.storm.topology.base.BaseRichBolt;
+import org.apache.storm.topology.base.BaseRichBolt;
 import org.apache.storm.jms.JmsMessageProducer;
 import org.apache.storm.jms.JmsProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import backtype.storm.task.OutputCollector;
-import backtype.storm.task.TopologyContext;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.tuple.Tuple;
+import org.apache.storm.task.OutputCollector;
+import org.apache.storm.task.TopologyContext;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.tuple.Tuple;
 
 /**
- * A JmsBolt receives <code>backtype.storm.tuple.Tuple</code> objects from a Storm
+ * A JmsBolt receives <code>org.apache.storm.tuple.Tuple</code> objects from a Storm
  * topology and publishes JMS Messages to a destination (topic or queue).
  * <p/>
  * To use a JmsBolt in a topology, the following must be supplied:
@@ -34,7 +34,7 @@
  * and <code>javax.jms.Destination</code> objects requied to publish JMS messages.
  * <p/>
  * The JmsBolt uses a <code>JmsMessageProducer</code> to translate 
- * <code>backtype.storm.tuple.Tuple</code> objects into
+ * <code>org.apache.storm.tuple.Tuple</code> objects into
  * <code>javax.jms.Message</code> objects for publishing.
  * <p/>
  * Both JmsProvider and JmsMessageProducer must be set, or the bolt will

src/main/java/org/apache/storm/jms/spout/JmsSpout.java

@@ -13,17 +13,17 @@
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
-import backtype.storm.topology.base.BaseRichSpout;
+import org.apache.storm.topology.base.BaseRichSpout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.storm.jms.JmsProvider;
 import org.apache.storm.jms.JmsTupleProducer;
-import backtype.storm.spout.SpoutOutputCollector;
-import backtype.storm.task.TopologyContext;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.tuple.Values;
-import backtype.storm.utils.Utils;
+import org.apache.storm.spout.SpoutOutputCollector;
+import org.apache.storm.task.TopologyContext;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.tuple.Values;
+import org.apache.storm.utils.Utils;
 
 /**
  * A Storm <code>Spout</code> implementation that listens to a JMS topic or queue
@@ -117,7 +117,7 @@ public void setJmsProvider(JmsProvider provider){
 	/**
 	 * Set the <code>JmsTupleProducer</code>
 	 * implementation that will convert <code>javax.jms.Message</code>
-	 * object to <code>backtype.storm.tuple.Values</code> objects
+	 * object to <code>org.apache.storm.tuple.Values</code> objects
 	 * to be emitted.
 	 * 
 	 * @param producer
@@ -156,7 +156,7 @@ public void open(Map conf, TopologyContext context,
 		if(this.tupleProducer == null){
 			throw new IllegalStateException("JMS Tuple Producer has not been set.");
 		}
-		Integer topologyTimeout = (Integer)conf.get("topology.message.timeout.secs");
+		Long topologyTimeout = (Long)conf.get("topology.message.timeout.secs");
 		// TODO fine a way to get the default timeout from storm, so we're not hard-coding to 30 seconds (it could change)
 		topologyTimeout = topologyTimeout == null ? 30 : topologyTimeout;
 		if( (topologyTimeout.intValue() * 1000 )> this.recoveryPeriod){

src/main/java/org/apache/storm/jms/trident/JmsState.java

@@ -18,12 +18,12 @@
 package org.apache.storm.jms.trident;
 
 import org.apache.storm.jms.JmsProvider;
-import backtype.storm.topology.FailedException;
+import org.apache.storm.topology.FailedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import storm.trident.operation.TridentCollector;
-import storm.trident.state.State;
-import storm.trident.tuple.TridentTuple;
+import org.apache.storm.trident.operation.TridentCollector;
+import org.apache.storm.trident.state.State;
+import org.apache.storm.trident.tuple.TridentTuple;
 
 import javax.jms.*;
 import java.io.Serializable;

src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java

@@ -17,9 +17,9 @@
  */
 package org.apache.storm.jms.trident;
 
-import backtype.storm.task.IMetricsContext;
-import storm.trident.state.State;
-import storm.trident.state.StateFactory;
+import org.apache.storm.task.IMetricsContext;
+import org.apache.storm.trident.state.State;
+import org.apache.storm.trident.state.StateFactory;
 
 import java.util.Map;
 

src/main/java/org/apache/storm/jms/trident/JmsUpdater.java

@@ -17,10 +17,10 @@
  */
 package org.apache.storm.jms.trident;
 
-import backtype.storm.topology.FailedException;
-import storm.trident.operation.TridentCollector;
-import storm.trident.state.BaseStateUpdater;
-import storm.trident.tuple.TridentTuple;
+import org.apache.storm.topology.FailedException;
+import org.apache.storm.trident.operation.TridentCollector;
+import org.apache.storm.trident.state.BaseStateUpdater;
+import org.apache.storm.trident.tuple.TridentTuple;
 
 import javax.jms.JMSException;
 import java.util.List;

src/main/java/org/apache/storm/jms/trident/TridentJmsMessageProducer.java

@@ -1,7 +1,7 @@
 package org.apache.storm.jms.trident;
 
-import backtype.storm.tuple.Tuple;
-import storm.trident.tuple.TridentTuple;
+import org.apache.storm.tuple.Tuple;
+import org.apache.storm.trident.tuple.TridentTuple;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -11,7 +11,7 @@
 public interface TridentJmsMessageProducer extends Serializable{
 
 	/**
-	 * Translate a <code>backtype.storm.tuple.TridentTuple</code> object
+	 * Translate a <code>org.apache.storm.tuple.TridentTuple</code> object
 	 * to a <code>javax.jms.Message</code object.
 	 *
 	 * @param session

src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java

@@ -19,17 +19,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import storm.trident.operation.TridentCollector;
-import storm.trident.spout.ITridentSpout;
-import storm.trident.topology.TransactionAttempt;
-import backtype.storm.Config;
-import backtype.storm.generated.StreamInfo;
-import backtype.storm.task.TopologyContext;
-import backtype.storm.topology.OutputFieldsGetter;
-import backtype.storm.tuple.Fields;
-import backtype.storm.tuple.Values;
-import backtype.storm.utils.RotatingMap;
-import backtype.storm.utils.Utils;
+import org.apache.storm.trident.operation.TridentCollector;
+import org.apache.storm.trident.spout.ITridentSpout;
+import org.apache.storm.trident.topology.TransactionAttempt;
+import org.apache.storm.Config;
+import org.apache.storm.generated.StreamInfo;
+import org.apache.storm.task.TopologyContext;
+import org.apache.storm.topology.OutputFieldsGetter;
+import org.apache.storm.tuple.Fields;
+import org.apache.storm.tuple.Values;
+import org.apache.storm.utils.RotatingMap;
+import org.apache.storm.utils.Utils;
 
 /**
  * Trident implementation of the JmsSpout, based on code provided by P. Taylor Goetz - https://github.com/ptgoetz
@@ -88,7 +88,7 @@ public TridentJmsSpout withJmsProvider(JmsProvider provider){
     /**
      * Set the <code>JmsTupleProducer</code>
      * implementation that will convert <code>javax.jms.Message</code>
-     * object to <code>backtype.storm.tuple.Values</code> objects
+     * object to <code>org.apache.storm.tuple.Values</code> objects
      * to be emitted.
      * 
      * @param tupleProducer
@@ -146,7 +146,7 @@ private static final String toDeliveryModeString(int acknowledgeMode) {
     }
 
     @Override
-    public storm.trident.spout.ITridentSpout.BatchCoordinator<JmsBatch> getCoordinator(
+    public org.apache.storm.trident.spout.ITridentSpout.BatchCoordinator<JmsBatch> getCoordinator(
             String txStateId, @SuppressWarnings("rawtypes") Map conf, TopologyContext context) {
         return new JmsBatchCoordinator(name);
     }

src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java

@@ -35,7 +35,7 @@
 import org.mortbay.log.Log;
 
 import org.apache.storm.jms.JmsProvider;
-import backtype.storm.spout.SpoutOutputCollector;
+import org.apache.storm.spout.SpoutOutputCollector;
 
 public class JmsSpoutTest {
     @Test

src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java

@@ -20,7 +20,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import backtype.storm.spout.ISpoutOutputCollector;
+import org.apache.storm.spout.ISpoutOutputCollector;
 
 public class MockSpoutOutputCollector implements ISpoutOutputCollector {
     boolean emitted = false;
@@ -40,6 +40,11 @@ public void emitDirect(int taskId, String streamId, List<Object> tuple, Object m
     public void reportError(Throwable error) {
     }
 
+    @Override
+    public long getPendingCount() {
+        return 0L;
+    }
+
     public boolean emitted(){
         return this.emitted;
     }

src/test/java/org/apache/storm/jms/spout/MockTupleProducer.java

@@ -22,9 +22,9 @@
 import javax.jms.TextMessage;
 
 import org.apache.storm.jms.JmsTupleProducer;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.tuple.Fields;
-import backtype.storm.tuple.Values;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.tuple.Fields;
+import org.apache.storm.tuple.Values;
 
 public class MockTupleProducer implements JmsTupleProducer {
     private static final long serialVersionUID = 1L;