You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/10/06 15:08:28 UTC
[33/50] [abbrv] storm git commit: remove unnecessary
TridentJmsMessageProducer; Update README
remove unnecessary TridentJmsMessageProducer; Update README
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0d2319ca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0d2319ca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0d2319ca
Branch: refs/heads/master
Commit: 0d2319ca892ff90c3cb6a3248e4ef3b482a53100
Parents: a12f643
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Aug 25 16:13:10 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Aug 25 16:13:10 2016 -0400
----------------------------------------------------------------------
README.markdown | 9 +++-----
.../apache/storm/jms/JmsMessageProducer.java | 4 ++--
.../org/apache/storm/jms/trident/JmsState.java | 5 +++--
.../jms/trident/TridentJmsMessageProducer.java | 22 --------------------
4 files changed, 8 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0d2319ca/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index a0e8500..05fb6ea 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,7 +1,7 @@
## About Storm JMS
Storm JMS is a generic framework for integrating JMS messaging within the Storm framework.
-The [Storm Rationale page](https://github.com/nathanmarz/storm/wiki/Rationale) explains what storm is and why it was built.
+The [Storm Rationale page](https://storm.apache.org/releases/1.0.2/Rationale.html) explains what storm is and why it was built.
Storm-JMS allows you to inject data into Storm via a generic JMS spout, as well as consume data from Storm via a generic JMS bolt.
@@ -21,11 +21,8 @@ The JMS Bolt component allows for data within a Storm topology to be published t
A JMS Bolt connects to a JMS Destination, and publishes JMS Messages based on the Storm "Tuple" objects it receives.
## Project Location
-Primary development of storm-cassandra will take place at:
-https://github.com/ptgoetz/storm-cassandra
-
-Point/stable (non-SNAPSHOT) release souce code will be pushed to:
-https://github.com/nathanmarz/storm-contrib
+Primary development of storm-jms will take place at:
+https://github.com/ptgoetz/storm-jms
Maven artifacts for releases will be available on maven central.
http://git-wip-us.apache.org/repos/asf/storm/blob/0d2319ca/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/storm/jms/JmsMessageProducer.java b/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
index 74676af..f77b6e1 100644
--- a/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
+++ b/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
@@ -6,7 +6,7 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.storm.tuple.Tuple;
+import org.apache.storm.tuple.ITuple;
/**
* JmsMessageProducer implementations are responsible for translating
* a <code>org.apache.storm.tuple.Values</code> instance into a
@@ -28,5 +28,5 @@ public interface JmsMessageProducer extends Serializable{
* @return
* @throws JMSException
*/
- public Message toMessage(Session session, Tuple input) throws JMSException;
+ public Message toMessage(Session session, ITuple input) throws JMSException;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/0d2319ca/src/main/java/org/apache/storm/jms/trident/JmsState.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/storm/jms/trident/JmsState.java b/src/main/java/org/apache/storm/jms/trident/JmsState.java
index 3159cfa..bfb78b5 100644
--- a/src/main/java/org/apache/storm/jms/trident/JmsState.java
+++ b/src/main/java/org/apache/storm/jms/trident/JmsState.java
@@ -17,6 +17,7 @@
*/
package org.apache.storm.jms.trident;
+import org.apache.storm.jms.JmsMessageProducer;
import org.apache.storm.jms.JmsProvider;
import org.apache.storm.topology.FailedException;
import org.slf4j.Logger;
@@ -45,7 +46,7 @@ public class JmsState implements State {
public static class Options implements Serializable {
private JmsProvider jmsProvider;
- private TridentJmsMessageProducer msgProducer;
+ private JmsMessageProducer msgProducer;
private int jmsAcknowledgeMode = Session.AUTO_ACKNOWLEDGE;
private boolean jmsTransactional = true;
@@ -54,7 +55,7 @@ public class JmsState implements State {
return this;
}
- public Options withMessageProducer(TridentJmsMessageProducer msgProducer) {
+ public Options withMessageProducer(JmsMessageProducer msgProducer) {
this.msgProducer = msgProducer;
return this;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/0d2319ca/src/main/java/org/apache/storm/jms/trident/TridentJmsMessageProducer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/storm/jms/trident/TridentJmsMessageProducer.java b/src/main/java/org/apache/storm/jms/trident/TridentJmsMessageProducer.java
deleted file mode 100644
index 532ed61..0000000
--- a/src/main/java/org/apache/storm/jms/trident/TridentJmsMessageProducer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.storm.jms.trident;
-
-import org.apache.storm.trident.tuple.TridentTuple;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import java.io.Serializable;
-
-public interface TridentJmsMessageProducer extends Serializable{
-
- /**
- * Translate a <code>backtype.storm.tuple.TridentTuple</code> object
- * to a <code>javax.jms.Message</code object.
- *
- * @param session
- * @param input
- * @return
- * @throws javax.jms.JMSException
- */
- public Message toMessage(Session session, TridentTuple input) throws JMSException;
-}