Branch: refs/heads/develop
  Home:   https://github.com/seam/jms

  Commit: ebbf2af32e961e069872acd26c5ee97ef0383d4b
      
https://github.com/seam/jms/commit/ebbf2af32e961e069872acd26c5ee97ef0383d4b
  Author: John D. Ament <[email protected]>
  Date:   2011-08-29 (Mon, 29 Aug 2011)

  Changed paths:
    M api/pom.xml
  M impl/pom.xml
  M impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverListener.java
  M impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverTest.java
  M impl/src/test/java/org/jboss/seam/jms/test/inject/PubSubTest.java
  M pom.xml

  Log Message:
  -----------
  Fixed tests.


  Commit: 2e9dc1039811eb9d8db6525cc70e1bec120dc79d
      
https://github.com/seam/jms/commit/2e9dc1039811eb9d8db6525cc70e1bec120dc79d
  Author: John D. Ament <[email protected]>
  Date:   2011-08-29 (Mon, 29 Aug 2011)

  Changed paths:
    M api/src/main/java/org/jboss/seam/jms/AbstractMessageListener.java
  M 
api/src/main/java/org/jboss/seam/jms/inject/JmsConnectionFactoryProducer.java
  M api/src/main/java/org/jboss/seam/jms/inject/JmsConnectionProducer.java
  M dist/src/main/assembly/assembly.xml
  M examples/jms-statuswatcher/src/main/assembly/assembly.xml
  M 
examples/jms-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/messagedriven/DistributorMDB.java
  M 
examples/jms-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/ReceivingClient.java
  M 
examples/jms-statuswatcher/src/main/java/org/jboss/seam/jms/example/statuswatcher/session/ReceivingClientListener.java
  M impl/pom.xml
  M impl/src/main/java/org/jboss/seam/jms/DurableMessageManagerImpl.java
  M impl/src/main/java/org/jboss/seam/jms/JmsMessageImpl.java
  M impl/src/main/java/org/jboss/seam/jms/MessageManagerImpl.java
  M impl/src/main/java/org/jboss/seam/jms/QueueBuilderImpl.java
  M impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java
  M impl/src/main/java/org/jboss/seam/jms/TopicBuilderImpl.java
  M impl/src/main/java/org/jboss/seam/jms/bridge/EgressRoutingObserver.java
  M impl/src/main/java/org/jboss/seam/jms/bridge/IngressMessageListener.java
  M impl/src/main/java/org/jboss/seam/jms/bridge/JmsMessageObserver.java
  M impl/src/main/java/org/jboss/seam/jms/bridge/RouteBuilderImpl.java
  M impl/src/main/java/org/jboss/seam/jms/bridge/RouteImpl.java
  M impl/src/main/java/org/jboss/seam/jms/tools/JMSResourceManager.java
  M impl/src/test/java/org/jboss/seam/jms/test/Util.java
  M impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverListener.java
  M impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverTest.java
  M 
impl/src/test/java/org/jboss/seam/jms/test/httpSession/SessionScopedTest.java
  M impl/src/test/java/org/jboss/seam/jms/test/inject/PubSubTest.java
  A impl/src/test/resources-jbossas/arquillian.xml
  M pom.xml

  Log Message:
  -----------
  Merge branch 'develop' of github.com:seam/jms into develop

Conflicts:
        impl/pom.xml
        
impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverListener.java
        impl/src/test/java/org/jboss/seam/jms/test/bridge/intf/ObserverTest.java
        impl/src/test/java/org/jboss/seam/jms/test/inject/PubSubTest.java

Fixed tests.


Compare: https://github.com/seam/jms/compare/346585a...2e9dc10
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits

Reply via email to