Permalink
Browse files

Merge branch 'master' of github.com:seam/jms

Conflicts:
	api/src/main/java/org/jboss/seam/jms/MessageManager.java
	api/src/main/java/org/jboss/seam/jms/annotations/Inbound.java
	api/src/main/java/org/jboss/seam/jms/annotations/Outbound.java
	api/src/main/java/org/jboss/seam/jms/bridge/EventBridge.java
	api/src/main/java/org/jboss/seam/jms/bridge/RouteType.java
	impl/src/main/java/org/jboss/seam/jms/MessageManagerImpl.java
	impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java
	impl/src/main/java/org/jboss/seam/jms/bridge/EgressRoutingObserver.java
	impl/src/main/java/org/jboss/seam/jms/bridge/IngressMessageListener.java
	impl/src/main/java/org/jboss/seam/jms/bridge/JmsEventBridge.java
	impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java
	impl/src/test/java/org/jboss/seam/jms/test/Util.java
	impl/src/test/java/org/jboss/seam/jms/test/bridge/JmsEventBridgeTest.java
	impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverTest.java
	impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConstructors.java
	impl/src/test/java/org/jboss/seam/jms/test/inject/InjectDestinationTest.java
	impl/src/test/java/org/jboss/seam/jms/test/inject/InjectFields.java
	impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageConsumer.java
	impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducer.java
	impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducerConsumerTest.java
	impl/src/test/java/org/jboss/seam/jms/test/stereotype/StereotypeTest.java
  • Loading branch information...
2 parents 2731a54 + 387e518 commit 1970ffffe834ccf766c38dc643d98387da315fcc @johnament johnament committed May 24, 2011
Showing with 4,707 additions and 2,873 deletions.
  1. +4 −5 api/src/main/java/org/jboss/seam/jms/AbstractMessageListener.java
  2. +39 −37 api/src/main/java/org/jboss/seam/jms/DurableMessageManager.java
  3. +15 −16 api/src/main/java/org/jboss/seam/jms/JmsForwarding.java
  4. +178 −179 api/src/main/java/org/jboss/seam/jms/MessageManager.java
  5. +402 −0 api/src/main/java/org/jboss/seam/jms/MessageManager.java.orig
  6. +12 −11 api/src/main/java/org/jboss/seam/jms/annotations/Closeable.java
  7. +9 −8 api/src/main/java/org/jboss/seam/jms/annotations/Durable.java
  8. +1 −1 api/src/main/java/org/jboss/seam/jms/annotations/Inbound.java
  9. +71 −0 api/src/main/java/org/jboss/seam/jms/annotations/Inbound.java.orig
  10. +10 −12 api/src/main/java/org/jboss/seam/jms/annotations/JmsDestination.java
  11. +16 −16 api/src/main/java/org/jboss/seam/jms/annotations/JmsSession.java
  12. +35 −42 api/src/main/java/org/jboss/seam/jms/annotations/JmsSessionSelector.java
  13. +1 −1 api/src/main/java/org/jboss/seam/jms/annotations/Outbound.java
  14. +72 −0 api/src/main/java/org/jboss/seam/jms/annotations/Outbound.java.orig
  15. +10 −4 api/src/main/java/org/jboss/seam/jms/annotations/Routing.java
  16. +36 −0 api/src/main/java/org/jboss/seam/jms/bridge/EventBridge.java
  17. +36 −0 api/src/main/java/org/jboss/seam/jms/bridge/EventBridge.java.orig
  18. +20 −21 api/src/main/java/org/jboss/seam/jms/bridge/Route.java
  19. +10 −8 api/src/main/java/org/jboss/seam/jms/bridge/RouteBuilder.java
  20. +9 −10 api/src/main/java/org/jboss/seam/jms/bridge/RouteLocator.java
  21. +1 −1 api/src/main/java/org/jboss/seam/jms/bridge/RouteManager.java
  22. +17 −19 api/src/main/java/org/jboss/seam/jms/bridge/RouteType.java
  23. +52 −0 api/src/main/java/org/jboss/seam/jms/bridge/RouteType.java.orig
  24. +21 −21 examples/jms-statuswatcher/src/main/assembly/assembly.xml
  25. +42 −52 ...swatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/messagedriven/DistributorMDB.java
  26. +110 −130 examples/jms-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/model/Status.java
  27. +1 −2 ...statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/qualifiers/StatusBridge.java
  28. +4 −5 ...-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/qualifiers/StatusTopic.java
  29. +9 −8 ...s-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/CdiJmsMapping.java
  30. +76 −98 ...statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/ReceivingClient.java
  31. +9 −8 ...tcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/ReceivingClientListener.java
  32. +1 −11 ...s-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/RoutingConfig.java
  33. +23 −29 ...s-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/SendingClient.java
  34. +4 −5 ...s-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/StatusManager.java
  35. +20 −22 ...atuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/StatusManagerImpl.java
  36. +9 −9 examples/jms-statuswatcher/src/main/resources-jboss6/statuswatcher-hornetq-jms.xml
  37. +12 −12 examples/jms-statuswatcher/src/main/resources/META-INF/persistence.xml
  38. +3 −3 examples/jms-statuswatcher/src/main/resources/META-INF/statuswatcher-ds.xml
  39. +3 −3 examples/jms-statuswatcher/src/main/webapp/WEB-INF/faces-config.xml
  40. +23 −23 examples/jms-statuswatcher/src/main/webapp/WEB-INF/web.xml
  41. +2 −2 examples/jms-statuswatcher/src/main/webapp/index.html
  42. +32 −31 examples/jms-statuswatcher/src/main/webapp/sendstatus.xhtml
  43. +93 −93 examples/jms-statuswatcher/src/main/webapp/style/style.css
  44. +43 −35 examples/jms-statuswatcher/src/main/webapp/watchstatus.xhtml
  45. +3 −3 examples/seam-jms-example-rest/src/main/java/org/jboss/seam/jms/examples/rest/MappingInterface.java
  46. +4 −3 examples/seam-jms-example-rest/src/main/java/org/jboss/seam/jms/examples/rest/MessageObserver.java
  47. +27 −15 .../seam-jms-example-rest/src/main/java/org/jboss/seam/jms/examples/rest/MessageSendingResource.java
  48. +18 −17 examples/seam-jms-example-rest/src/main/java/org/jboss/seam/jms/examples/rest/QueueHandlerMDB.java
  49. +3 −3 examples/seam-jms-example-rest/src/main/webapp/WEB-INF/web.xml
  50. +0 −2 impl/src/main/java/org/jboss/seam/jms/DurableMessageManagerImpl.java
  51. +221 −218 impl/src/main/java/org/jboss/seam/jms/MessageManagerImpl.java
  52. +452 −0 impl/src/main/java/org/jboss/seam/jms/MessageManagerImpl.java.orig
  53. +9 −7 impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java
  54. +261 −0 impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java.orig
  55. +7 −8 impl/src/main/java/org/jboss/seam/jms/annotations/EventRouting.java
  56. +10 −11 impl/src/main/java/org/jboss/seam/jms/annotations/Module.java
  57. +17 −17 impl/src/main/java/org/jboss/seam/jms/annotations/RoutingLiteral.java
  58. +25 −26 impl/src/main/java/org/jboss/seam/jms/bridge/EgressRoutingObserver.java
  59. +171 −0 impl/src/main/java/org/jboss/seam/jms/bridge/EgressRoutingObserver.java.orig
  60. +63 −64 impl/src/main/java/org/jboss/seam/jms/bridge/IngressMessageListener.java
  61. +123 −0 impl/src/main/java/org/jboss/seam/jms/bridge/IngressMessageListener.java.orig
  62. +58 −58 impl/src/main/java/org/jboss/seam/jms/bridge/RouteBuilderImpl.java
  63. +134 −146 impl/src/main/java/org/jboss/seam/jms/bridge/RouteImpl.java
  64. +28 −26 impl/src/main/java/org/jboss/seam/jms/bridge/RouteLocatorImpl.java
  65. +1 −1 impl/src/main/java/org/jboss/seam/jms/bridge/RouteManagerImpl.java
  66. +24 −28 impl/src/main/java/org/jboss/seam/jms/impl/inject/ConnectionProducer.java
  67. +9 −12 impl/src/main/java/org/jboss/seam/jms/impl/inject/ContextProducer.java
  68. +13 −13 impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java
  69. +71 −0 impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java.orig
  70. +21 −25 impl/src/main/java/org/jboss/seam/jms/impl/inject/InjectionUtil.java
  71. +49 −56 impl/src/main/java/org/jboss/seam/jms/impl/inject/MessagePubSubProducer.java
  72. +47 −64 impl/src/main/java/org/jboss/seam/jms/impl/inject/SessionProducer.java
  73. +113 −143 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsAnnotatedTypeWrapper.java
  74. +59 −76 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationAnnotatedWrapper.java
  75. +57 −70 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationCallableWrapper.java
  76. +13 −17 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationConstructorWrapper.java
  77. +23 −29 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationFieldWrapper.java
  78. +13 −17 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationMethodWrapper.java
  79. +20 −25 impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationParameterWrapper.java
  80. +18 −16 impl/src/main/java/org/jboss/seam/jms/tools/JMSResourceManager.java
  81. +2 −2 impl/src/main/resources/META-INF/beans.xml
  82. +21 −27 impl/src/test/java/org/jboss/seam/jms/test/Util.java
  83. +87 −0 impl/src/test/java/org/jboss/seam/jms/test/Util.java.orig
  84. +2 −1 impl/src/test/java/org/jboss/seam/jms/test/bridge/IngressInterfaceProducer.java
  85. +26 −25 impl/src/test/java/org/jboss/seam/jms/test/bridge/RouteImplTest.java
  86. +15 −15 impl/src/test/java/org/jboss/seam/jms/test/bridge/durablemsg/DurableMessageManagerTest.java
  87. +20 −19 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/BidirectionalTest.java
  88. +12 −16 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/IngressTest.java
  89. +7 −5 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverInterface.java
  90. +6 −5 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverListener.java
  91. +17 −11 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverTest.java
  92. +96 −0 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverTest.java.orig
  93. +10 −11 impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/SimpleListener.java
  94. +73 −73 impl/src/test/java/org/jboss/seam/jms/test/bridge/msg/MessageManagerTest.java
  95. +3 −4 impl/src/test/java/org/jboss/seam/jms/test/bridge/route/BridgedViaCollection.java
  96. +3 −4 impl/src/test/java/org/jboss/seam/jms/test/bridge/route/BridgedViaRoute.java
  97. +77 −82 impl/src/test/java/org/jboss/seam/jms/test/bridge/route/RouteTest.java
  98. +25 −29 impl/src/test/java/org/jboss/seam/jms/test/bridge/route/RoutingConfig.java
  99. +2 −2 impl/src/test/java/org/jboss/seam/jms/test/descriptor/HornetQJMSDescriptor.java
  100. +53 −60 impl/src/test/java/org/jboss/seam/jms/test/descriptor/HornetQJMSDescriptorImpl.java
  101. +14 −14 impl/src/test/java/org/jboss/seam/jms/test/descriptor/QueueDescriptor.java
  102. +14 −14 impl/src/test/java/org/jboss/seam/jms/test/descriptor/TopicDescriptor.java
  103. +11 −7 impl/src/test/java/org/jboss/seam/jms/test/httpSession/SessionScopedTest.java
  104. +17 −31 impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConnectionTest.java
  105. +15 −13 impl/src/test/java/org/jboss/seam/jms/test/inject/PubSubTest.java
  106. +10 −7 impl/src/test/java/org/jboss/seam/jms/test/inject/destination/DestinationProducers.java
  107. +37 −35 impl/src/test/java/org/jboss/seam/jms/test/inject/destination/InjectDestinationViaResource.java
  108. +1 −2 impl/src/test/java/org/jboss/seam/jms/test/inject/session/EventSession.java
  109. +53 −60 impl/src/test/java/org/jboss/seam/jms/test/inject/session/InjectSessionTest.java
  110. +7 −9 impl/src/test/java/org/jboss/seam/jms/test/inject/session/SessionSelectorBean.java
  111. +2 −2 impl/src/test/java/org/jboss/seam/jms/test/locator/LocatorInterface.java
  112. +14 −7 impl/src/test/java/org/jboss/seam/jms/test/locator/LocatorTest.java
  113. +2 −3 impl/src/test/java/org/jboss/seam/jms/test/stereotype/StereotypeTest.java
  114. +101 −0 impl/src/test/java/org/jboss/seam/jms/test/stereotype/StereotypeTest.java.orig
  115. +15 −13 impl/src/test/java/org/jboss/seam/jms/test/tools/JMSResourceManagerTest.java
  116. +25 −25 impl/src/test/java/org/jboss/seam/jms/test/transmit/SimpleTransmitMessageTest.java
  117. +31 −31 impl/src/test/resources-jbossas/hornetq-jms.xml
@@ -24,10 +24,9 @@
/**
* Supporting base MessageListener for working in CDI enabled environments.
- * This is useful for having a MessageListener
- *
- * @author johnament
+ * This is useful for having a MessageListener
*
+ * @author johnament
*/
public abstract class AbstractMessageListener implements javax.jms.MessageListener {
@@ -57,7 +56,7 @@ protected void setClassLoader(ClassLoader classLoader) {
/**
* AbstractMessageListener implements the basic on message functionality to
* handle classloader behavior for working in CDI environments.
- *
+ * <p/>
* This method should not be overridden, even though it is not final.
*
* @param message The JMS Message that is being received.
@@ -78,7 +77,7 @@ public void onMessage(Message message) {
/**
* Implementations should override this method and
* perform necessary business logic in here.
- *
+ * <p/>
* A BeanManager reference is available, for looking up beans.
*
* @param message The message to be handled.
@@ -24,42 +24,44 @@
@Durable
public interface DurableMessageManager extends MessageManager {
-
- /**
- * Initializes the connection for this DurableMessageManager.
- * Sets the ClientID for the underlying {@link javax.jms.Connection}
- *
- * @param clientId
- */
- public void login(String clientId);
- /**
- * Creates a topic subscriber with the given ID and binds a message listener to it, if valid.
- *
- * {@see MessageBuilder.createDurableSubscriber}
- *
- * @param topic JNDI Location of the topic to subscribe to.
- * @param id the client id for the subscriber. This ID should be unique, and should be used to shutdown the listener.
- * @param listener The Message Listeners to be bound, if any.
- * @return the resulting TopicSubscriber or null if an error occurred.
- */
- public TopicSubscriber createDurableSubscriber(String topic, String id, MessageListener... listeners);
-
- /**
- * Creates a topic subscriber with the given ID and binds a message listener to it, if valid.
- *
- * {@see MessageBuilder.createDurableSubscriber}
- *
- * @param topic the existing destination to reference.
- * @param id the client id for the subscriber. This ID should be unique, and should be used to shutdown the listener.
- * @param listener The Message Listeners to be bound, if any.
- * @return the resulting TopicSubscriber or null if an error occurred.
- */
- public TopicSubscriber createDurableSubscriber(Topic topic, String id, MessageListener... listeners);
- /**
- * Unsubscribes a durable subscriber from the topic, with the given id.
- *
- * @param id the id of the subscriber.
- */
- public void unsubscribe(String id);
+
+ /**
+ * Initializes the connection for this DurableMessageManager.
+ * Sets the ClientID for the underlying {@link javax.jms.Connection}
+ *
+ * @param clientId
+ */
+ public void login(String clientId);
+
+ /**
+ * Creates a topic subscriber with the given ID and binds a message listener to it, if valid.
+ * <p/>
+ * {@see MessageBuilder.createDurableSubscriber}
+ *
+ * @param topic JNDI Location of the topic to subscribe to.
+ * @param id the client id for the subscriber. This ID should be unique, and should be used to shutdown the listener.
+ * @param listener The Message Listeners to be bound, if any.
+ * @return the resulting TopicSubscriber or null if an error occurred.
+ */
+ public TopicSubscriber createDurableSubscriber(String topic, String id, MessageListener... listeners);
+
+ /**
+ * Creates a topic subscriber with the given ID and binds a message listener to it, if valid.
+ * <p/>
+ * {@see MessageBuilder.createDurableSubscriber}
+ *
+ * @param topic the existing destination to reference.
+ * @param id the client id for the subscriber. This ID should be unique, and should be used to shutdown the listener.
+ * @param listener The Message Listeners to be bound, if any.
+ * @return the resulting TopicSubscriber or null if an error occurred.
+ */
+ public TopicSubscriber createDurableSubscriber(Topic topic, String id, MessageListener... listeners);
+
+ /**
+ * Unsubscribes a durable subscriber from the topic, with the given id.
+ *
+ * @param id the id of the subscriber.
+ */
+ public void unsubscribe(String id);
}
@@ -26,25 +26,24 @@
/**
* Configuration for the forwarding of events to JMS.
- *
+ *
* @author Jordan Ganoff
*/
@Named
@ApplicationScoped
-public interface JmsForwarding
-{
- /**
- * Destinations to forward events to.
- */
- public Set<? extends Destination> getDestinations();
+public interface JmsForwarding {
+ /**
+ * Destinations to forward events to.
+ */
+ public Set<? extends Destination> getDestinations();
+
+ /**
+ * Event type to observe and forward.
+ */
+ public Type getEventType();
- /**
- * Event type to observe and forward.
- */
- public Type getEventType();
-
- /**
- * Set of qualifiers that must exist on each event of type {@link #getEventType()}.
- */
- public Set<Annotation> getQualifiers();
+ /**
+ * Set of qualifiers that must exist on each event of type {@link #getEventType()}.
+ */
+ public Set<Annotation> getQualifiers();
}
Oops, something went wrong.

0 comments on commit 1970fff

Please sign in to comment.