svn commit: r1628133 - /qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js

[macbean]

Author: macbean
Date: Mon Sep 29 08:09:55 2014
New Revision: 1628133

URL: http://svn.apache.org/r1628133
Log:
NO-JIRA: [Java Broker] UI change to update BDB HA permitted nodes hidden field 
correctly

Modified:

qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js

Modified: 
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1628133r1=1628132r2=1628133view=diff
==
--- 
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
 (original)
+++ 
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
 Mon Sep 29 08:09:55 2014
@@ -106,6 +106,7 @@ define([dojo/_base/xhr,
 _changeAddress: function(address, virtualHostNodeHelperAddress)
 {
   virtualHostNodeHelperAddress.set(value, address);
+  this._updatePermittedNodesJson();
 },
 _clickAddPermittedNodeButton: function(e)
 {



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628177 - /qpid/proton/trunk/tools/cmake/Modules/FindPerlLibs.cmake

[mcpierce]

Author: mcpierce
Date: Mon Sep 29 13:13:18 2014
New Revision: 1628177

URL: http://svn.apache.org/r1628177
Log:
PROTON-465: FindPerlLibs fails on Ubuntu 12

If the search for libperl.so fails using the standard search in CMake,
then this alternative tool kicks in and searchs other known locations
for the file.

Modified:
qpid/proton/trunk/tools/cmake/Modules/FindPerlLibs.cmake

Modified: qpid/proton/trunk/tools/cmake/Modules/FindPerlLibs.cmake
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/FindPerlLibs.cmake?rev=1628177r1=1628176r2=1628177view=diff
==
--- qpid/proton/trunk/tools/cmake/Modules/FindPerlLibs.cmake (original)
+++ qpid/proton/trunk/tools/cmake/Modules/FindPerlLibs.cmake Mon Sep 29 
13:13:18 2014
@@ -29,6 +29,25 @@ if(NOT PERLLIBS_FOUND)
 
   # if either the library path is not found not set at all
   # then do our own search
+  if ( NOT PERL_LIBRARY )
+EXECUTE_PROCESS( COMMAND ${PERL_EXECUTABLE} -V:libperl
+ OUTPUT_VARIABLE PERL_LIBRARY_OUTPUT
+ RESULT_VARIABLE PERL_LIBRARY_RESULT )
+
+IF ( NOT PERL_LIBRARY_RESULT )
+  string(REGEX REPLACE libperl='([^']+)'.* \\1 PERL_POSSIBLE_LIBRARIES 
${PERL_LIBRARY_OUTPUT})
+ENDIF ( NOT PERL_LIBRARY_RESULT )
+
+MESSAGE ( STATUS  Looking for ${PERL_POSSIBLE_LIBRARIES} )
+
+find_file(PERL_LIBRARY
+  NAMES ${PERL_POSSIBLE_LIBRARIES}
+  PATHS /usr/lib
+${PERL_ARCHLIB}/CORE
+  )
+
+  endif ( NOT PERL_LIBRARY )
+
   IF ( PERL_LIBRARY MATCHES .*-NOTFOUND OR NOT PERL_LIBRARY )
   EXECUTE_PROCESS ( COMMAND ${PERL_EXECUTABLE}
 -MConfig -e print \$Config{libperl}



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

git commit: Create the message level Destination and ReplyTo objects lazily since we may never need them if the client doesn't call getJMSDestination or getJMSReplyTo, pushes off the work to the clien

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/master 0d7e2539a - cc9f8dfea


Create the message level Destination and ReplyTo objects lazily since we
may never need them if the client doesn't call getJMSDestination or
getJMSReplyTo, pushes off the work to the client threads.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cc9f8dfe
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cc9f8dfe
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cc9f8dfe

Branch: refs/heads/master
Commit: cc9f8dfea8e91aabf5b50a9edfc120f90ba0841a
Parents: 0d7e253
Author: Timothy Bish tabish...@gmail.com
Authored: Mon Sep 29 09:42:22 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Mon Sep 29 09:42:22 2014 -0400

--
 .../provider/amqp/message/AmqpJmsMessageFacade.java| 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cc9f8dfe/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 02f3d7e..8d1b774 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -67,6 +67,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade 
{
 
 private JmsDestination replyTo;
 private JmsDestination destination;
+private JmsDestination consumerDestination;
 
 private Long syntheticTTL;
 
@@ -103,6 +104,7 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 public AmqpJmsMessageFacade(AmqpConsumer consumer, Message message) {
 this.message = message;
 this.connection = consumer.getConnection();
+this.consumerDestination = consumer.getDestination();
 
 annotations = message.getMessageAnnotations();
 if (annotations != null) {
@@ -118,9 +120,6 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 if (absoluteExpiryTime == null  ttl != null) {
 syntheticTTL = System.currentTimeMillis() + ttl;
 }
-
-this.destination = 
AmqpDestinationHelper.INSTANCE.getJmsDestination(this, 
consumer.getDestination());
-this.replyTo = AmqpDestinationHelper.INSTANCE.getJmsReplyTo(this, 
consumer.getDestination());
 }
 
 /**
@@ -580,6 +579,10 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 
 @Override
 public JmsDestination getDestination() {
+if (destination == null) {
+this.destination = 
AmqpDestinationHelper.INSTANCE.getJmsDestination(this, consumerDestination);
+}
+
 return destination;
 }
 
@@ -592,6 +595,10 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 
 @Override
 public JmsDestination getReplyTo() {
+if (replyTo == null) {
+replyTo = AmqpDestinationHelper.INSTANCE.getJmsReplyTo(this, 
consumerDestination);
+}
+
 return replyTo;
 }
 


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[2/2] git commit: Add tests for the default cases when doing a Get

[tabish]

Add tests for the default cases when doing a Get

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/52e02b69
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/52e02b69
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/52e02b69

Branch: refs/heads/master
Commit: 52e02b692c71e642adc0a90a4c77f45612f88c5e
Parents: bb6959d
Author: Timothy Bish tabish...@gmail.com
Authored: Mon Sep 29 11:22:53 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Mon Sep 29 11:22:53 2014 -0400

--
 .../JmsMessagePropertyIntercepterTest.java  | 106 +++
 1 file changed, 106 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/52e02b69/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
--
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index 535d203..63252c6 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -30,11 +30,16 @@ import static 
org.apache.qpid.jms.message.JmsMessageSupport.JMS_REDELIVERED;
 import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_REPLYTO;
 import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_TIMESTAMP;
 import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_TYPE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import javax.jms.JMSException;
 
+import org.apache.qpid.jms.message.facade.JmsMessageFacade;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class JmsMessagePropertyIntercepterTest {
 
@@ -45,6 +50,13 @@ public class JmsMessagePropertyIntercepterTest {
 
assertTrue(JmsMessagePropertyIntercepter.getAllPropertyNames().contains(JMS_DESTINATION));
 }
 
+@Test
+public void testGetJMSDestinationWhenNotSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+assertNull(JmsMessagePropertyIntercepter.getProperty(message, 
JMS_DESTINATION));
+Mockito.verify(message).getDestination();
+}
+
 //-- JMSReplyTo 
--//
 
 @Test
@@ -52,6 +64,13 @@ public class JmsMessagePropertyIntercepterTest {
 
assertTrue(JmsMessagePropertyIntercepter.getAllPropertyNames().contains(JMS_REPLYTO));
 }
 
+@Test
+public void testGetJMSReplyToWhenNotSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+assertNull(JmsMessagePropertyIntercepter.getProperty(message, 
JMS_REPLYTO));
+Mockito.verify(message).getReplyTo();
+}
+
 //-- JMSType 
-//
 
 @Test
@@ -59,6 +78,13 @@ public class JmsMessagePropertyIntercepterTest {
 
assertTrue(JmsMessagePropertyIntercepter.getAllPropertyNames().contains(JMS_TYPE));
 }
 
+@Test
+public void testGetJMSTypeWhenNotSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+assertNull(JmsMessagePropertyIntercepter.getProperty(message, 
JMS_TYPE));
+Mockito.verify(message).getType();
+}
+
 //-- JMSDeliveryMode 
-//
 
 @Test
@@ -66,6 +92,13 @@ public class JmsMessagePropertyIntercepterTest {
 
assertTrue(JmsMessagePropertyIntercepter.getAllPropertyNames().contains(JMS_DELIVERY_MODE));
 }
 
+@Test
+public void testGetJMSDeliveryModeWhenNotSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+assertEquals(NON_PERSISTENT, 
JmsMessagePropertyIntercepter.getProperty(message, JMS_DELIVERY_MODE));
+Mockito.verify(message).isPersistent();
+}
+
 //-- JMSPriority -//
 
 @Test
@@ -73,6 +106,14 @@ public class JmsMessagePropertyIntercepterTest {
 
assertTrue(JmsMessagePropertyIntercepter.getAllPropertyNames().contains(JMS_PRIORITY));
 }
 
+@Test
+public void testGetJMSPriorityWhenNotSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+Mockito.when(message.getPriority()).thenReturn((byte) 4);
+assertEquals(4, JmsMessagePropertyIntercepter.getProperty(message, 

[1/2] git commit: Add some initial testing and cleanup around JmsMessagePropertyIntercepter

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/master cc9f8dfea - 52e02b692


Add some initial testing and cleanup around
JmsMessagePropertyIntercepter

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/bb6959dc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/bb6959dc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/bb6959dc

Branch: refs/heads/master
Commit: bb6959dc5a91d7ece4221041e36c0cd4d266ddc4
Parents: cc9f8df
Author: Timothy Bish tabish...@gmail.com
Authored: Mon Sep 29 10:38:59 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Mon Sep 29 10:38:59 2014 -0400

--
 .../message/JmsMessagePropertyIntercepter.java  |  43 --
 .../qpid/jms/message/JmsMessageSupport.java |  40 ++
 .../JmsMessagePropertyIntercepterTest.java  | 139 +++
 3 files changed, 208 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bb6959dc/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
index 22116ee..6b2d3e3 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
@@ -16,6 +16,21 @@
  */
 package org.apache.qpid.jms.message;
 
+import static 
org.apache.qpid.jms.message.JmsMessageSupport.JMSX_DELIVERY_COUNT;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMSX_GROUPID;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMSX_GROUPSEQ;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMSX_USERID;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_CORRELATIONID;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_DELIVERY_MODE;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_DESTINATION;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_EXPIRATION;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_MESSAGEID;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_PRIORITY;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_REDELIVERED;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_REPLYTO;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_TIMESTAMP;
+import static org.apache.qpid.jms.message.JmsMessageSupport.JMS_TYPE;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -86,7 +101,7 @@ public class JmsMessagePropertyIntercepter {
 }
 
 static {
-PROPERTY_INTERCEPTERS.put(JMSXDeliveryCount, new 
PropertyIntercepter() {
+PROPERTY_INTERCEPTERS.put(JMSX_DELIVERY_COUNT, new 
PropertyIntercepter() {
 @Override
 public void setProperty(JmsMessageFacade message, Object value) 
throws JMSException {
 Integer rc = (Integer) TypeConversionSupport.convert(value, 
Integer.class);
@@ -106,7 +121,7 @@ public class JmsMessagePropertyIntercepter {
 return true;
 }
 });
-PROPERTY_INTERCEPTERS.put(JMSDestination, new PropertyIntercepter() {
+PROPERTY_INTERCEPTERS.put(JMS_DESTINATION, new PropertyIntercepter() {
 @Override
 public void setProperty(JmsMessageFacade message, Object value) 
throws JMSException {
 JmsDestination rc = (JmsDestination) 
TypeConversionSupport.convert(value, JmsDestination.class);
@@ -130,7 +145,7 @@ public class JmsMessagePropertyIntercepter {
 return message.getDestination() != null;
 }
 });
-PROPERTY_INTERCEPTERS.put(JMSReplyTo, new PropertyIntercepter() {
+PROPERTY_INTERCEPTERS.put(JMS_REPLYTO, new PropertyIntercepter() {
 @Override
 public void setProperty(JmsMessageFacade message, Object value) 
throws JMSException {
 JmsDestination rc = (JmsDestination) 
TypeConversionSupport.convert(value, JmsDestination.class);
@@ -153,7 +168,7 @@ public class JmsMessagePropertyIntercepter {
 return message.getReplyTo() != null;
 }
 });
-PROPERTY_INTERCEPTERS.put(JMSType, new PropertyIntercepter() {
+PROPERTY_INTERCEPTERS.put(JMS_TYPE, new PropertyIntercepter() {
 @Override
 public Object getProperty(JmsMessageFacade message) throws 
JMSException {
 return message.getType();
@@ -173,7 +188,7 @@ public class 

[05/11] git commit: stop application properties being overwritten when retrieving the contents from the facade

[robbie]

stop application properties being overwritten when retrieving the contents from 
the facade


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/66bc0033
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/66bc0033
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/66bc0033

Branch: refs/heads/master
Commit: 66bc0033e0b0ee13da95202b706491af09c1fe29
Parents: 161bba6
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 10:02:31 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:09:37 2014 +0100

--
 .../amqp/message/AmqpJmsMessageFacade.java | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/66bc0033/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 8d1b774..5a514b8 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -151,7 +151,7 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 
 @Override
 public MapString, Object getProperties() throws JMSException {
-lazyCreateProperties();
+lazyCreateApplicationProperties();
 return Collections.unmodifiableMap(new HashMapString, 
Object(applicationPropertiesMap));
 }
 
@@ -204,10 +204,7 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 }
 
 public void setApplicationProperty(String key, Object value) throws 
JMSException {
-if (applicationPropertiesMap == null) {
-lazyCreateProperties();
-}
-
+lazyCreateApplicationProperties();
 applicationPropertiesMap.put(key, value);
 }
 
@@ -300,7 +297,7 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 }
 
 if (applicationPropertiesMap != null) {
-target.lazyCreateProperties();
+target.lazyCreateApplicationProperties();
 target.applicationPropertiesMap.putAll(applicationPropertiesMap);
 }
 
@@ -809,8 +806,10 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 }
 }
 
-private void lazyCreateProperties() {
-applicationPropertiesMap = new HashMapString,Object();
-message.setApplicationProperties(new 
ApplicationProperties(applicationPropertiesMap));
+private void lazyCreateApplicationProperties() {
+if (applicationPropertiesMap == null) {
+applicationPropertiesMap = new HashMapString, Object();
+message.setApplicationProperties(new 
ApplicationProperties(applicationPropertiesMap));
+}
 }
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[11/11] git commit: add temporary ignore on test

[robbie]

add temporary ignore on test


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a83589ea
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a83589ea
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a83589ea

Branch: refs/heads/master
Commit: a83589eac5146dc9b443b4fe6d00fb18e90a09c3
Parents: 1b10a6a
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 17:08:02 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:16:25 2014 +0100

--
 .../apache/qpid/jms/transactions/JmsTransactedConsumerTest.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a83589ea/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
--
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
index 49121ad..14632ed 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
@@ -28,6 +28,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.qpid.jms.support.AmqpTestSupport;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -167,6 +168,10 @@ public class JmsTransactedConsumerTest extends 
AmqpTestSupport {
 assertEquals(0, proxy.getQueueSize());
 }
 
+@Ignore // TODO: failing because the broker appears to be setting the AMQP
+// delivery-count header too high after the first rollback. It
+// arrives null initially (i.e, default 0), then jumps to 2 causing
+// JMSXDeliveryCount to be 3 rather than 2.
 @Test(timeout=6)
 public void testJMSXDeliveryCount() throws Exception {
 sendToAmqQueue(1);


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[06/11] git commit: add toString for the selector filter

[robbie]

add toString for the selector filter


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a1bcdbbe
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a1bcdbbe
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a1bcdbbe

Branch: refs/heads/master
Commit: a1bcdbbee7e136a1772a2cbb6a41ebcba46d025a
Parents: 6d80d99
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 12:01:44 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:09:37 2014 +0100

--
 .../org/apache/qpid/jms/provider/amqp/AmqpJmsSelectorType.java  | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a1bcdbbe/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJmsSelectorType.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJmsSelectorType.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJmsSelectorType.java
index 021f943..c6c2601 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJmsSelectorType.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJmsSelectorType.java
@@ -39,4 +39,9 @@ public class AmqpJmsSelectorType implements DescribedType {
 public Object getDescribed() {
 return this.selector;
 }
+
+@Override
+public String toString() {
+return AmqpJmsSelectorType{ + selector + };
+}
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[03/11] git commit: add some logging of test phases to aid debugging

[robbie]

add some logging of test phases to aid debugging


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c294a3c7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c294a3c7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c294a3c7

Branch: refs/heads/master
Commit: c294a3c7e7b15d663529ec09febaaafa059cf772
Parents: 270765a
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 11:52:07 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:09:37 2014 +0100

--
 .../java/org/apache/qpid/jms/support/QpidJmsTestSupport.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c294a3c7/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
--
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
index abb1bb4..509a551 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
@@ -80,6 +80,7 @@ public class QpidJmsTestSupport {
 
 @Before
 public void setUp() throws Exception {
+LOG.info(== setUp  + getTestName() +  ==);
 exceptions.clear();
 startPrimaryBroker();
 this.numberOfMessages = 2000;
@@ -87,6 +88,7 @@ public class QpidJmsTestSupport {
 
 @After
 public void tearDown() throws Exception {
+LOG.info(== tearDown  + getTestName() +  ==);
 if (connection != null) {
 connection.close();
 }
@@ -444,4 +446,8 @@ public class QpidJmsTestSupport {
 protected boolean isSendAcksAsync() {
 return false;
 }
+
+protected String getTestName() {
+return getClass().getSimpleName() + . + name.getMethodName();
+}
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[09/11] git commit: switch to using the the AMQP message facades

[robbie]

switch to using the the AMQP message facades


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1b10a6a7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1b10a6a7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1b10a6a7

Branch: refs/heads/master
Commit: 1b10a6a72fd9ffe4e65f238570d954b2aee5a1fc
Parents: 9e3b5ec
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 12:16:07 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:16:24 2014 +0100

--
 .../qpid/jms/provider/amqp/AmqpJMSVendor.java   |  4 ++--
 .../amqp/message/AmqpJmsMessageFactory.java | 25 +---
 2 files changed, 8 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1b10a6a7/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java
index eba019e..fbe2b21 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java
@@ -34,9 +34,9 @@ import org.apache.qpid.jms.JmsQueue;
 import org.apache.qpid.jms.JmsTemporaryQueue;
 import org.apache.qpid.jms.JmsTemporaryTopic;
 import org.apache.qpid.jms.JmsTopic;
-import org.apache.qpid.jms.message.JmsDefaultMessageFactory;
 import org.apache.qpid.jms.message.JmsMessage;
 import org.apache.qpid.jms.message.JmsMessageFactory;
+import org.apache.qpid.jms.provider.amqp.message.AmqpJmsMessageFactory;
 import org.apache.qpid.proton.jms.JMSVendor;
 
 /**
@@ -48,7 +48,7 @@ public class AmqpJMSVendor extends JMSVendor {
 
 public static final AmqpJMSVendor INSTANCE = new AmqpJMSVendor();
 
-private final JmsMessageFactory factory = new JmsDefaultMessageFactory();
+private final JmsMessageFactory factory = new AmqpJmsMessageFactory();
 
 private AmqpJMSVendor() {
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1b10a6a7/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java
index 882c2ac..3a918de 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java
@@ -31,12 +31,6 @@ import org.apache.qpid.jms.message.JmsStreamMessage;
 import org.apache.qpid.jms.message.JmsTextMessage;
 import org.apache.qpid.jms.message.facade.JmsObjectMessageFacade;
 import org.apache.qpid.jms.message.facade.JmsTextMessageFacade;
-import 
org.apache.qpid.jms.message.facade.defaults.JmsDefaultBytesMessageFacade;
-import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMapMessageFacade;
-import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMessageFacade;
-import 
org.apache.qpid.jms.message.facade.defaults.JmsDefaultObjectMessageFacade;
-import 
org.apache.qpid.jms.message.facade.defaults.JmsDefaultStreamMessageFacade;
-import org.apache.qpid.jms.message.facade.defaults.JmsDefaultTextMessageFacade;
 import org.apache.qpid.jms.provider.amqp.AmqpConnection;
 
 /**
@@ -66,8 +60,7 @@ public class AmqpJmsMessageFactory implements 
JmsMessageFactory {
 
 @Override
 public JmsMessage createMessage() throws JMSException {
-//return new JmsMessage(new AmqpJmsMessageFacade(connection));
-return new JmsMessage(new JmsDefaultMessageFacade());
+return new JmsMessage(new AmqpJmsMessageFacade(connection));
 }
 
 @Override
@@ -78,8 +71,7 @@ public class AmqpJmsMessageFactory implements 
JmsMessageFactory {
 @Override
 public JmsTextMessage createTextMessage(String payload) throws 
JMSException {
 
-// JmsTextMessageFacade facade = new 
AmqpJmsTextMessageFacade(connection);
-JmsTextMessageFacade facade = new JmsDefaultTextMessageFacade();
+JmsTextMessageFacade facade = new AmqpJmsTextMessageFacade(connection);
 
 if (payload != null) {
 facade.setText(payload);
@@ -90,20 +82,17 @@ public class AmqpJmsMessageFactory implements 
JmsMessageFactory {
 
 @Override
 public JmsBytesMessage createBytesMessage() throws JMSException {
-// return new JmsBytesMessage(new 
AmqpJmsBytesMessageFacade(connection));
-return 

[08/11] git commit: update provider factory error logging, correct class and include exception toString as further aid

[robbie]

update provider factory error logging, correct class and include exception 
toString as further aid


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/270765ac
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/270765ac
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/270765ac

Branch: refs/heads/master
Commit: 270765ac2bfb86be695a136ac47c2b5fb787751c
Parents: 66bc003
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 10:39:25 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:09:37 2014 +0100

--
 .../main/java/org/apache/qpid/jms/provider/ProviderFactory.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/270765ac/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
index c07518e..f1c5dbd 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
@@ -71,7 +71,7 @@ public abstract class ProviderFactory {
 result = factory.createAsyncProvider(remoteURI);
 result.connect();
 } catch (Exception ex) {
-LOG.error(Failed to create BlockingProvider instance for: {}, 
remoteURI.getScheme());
+LOG.error(Failed to create Provider instance for {}, due to: {}, 
remoteURI.getScheme(), ex);
 LOG.trace(Error: , ex);
 throw ex;
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[10/11] git commit: use AmqpJmsMessageBuilder to create incoming messages, remove transformer usage

[robbie]

use AmqpJmsMessageBuilder to create incoming messages, remove transformer usage


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9e3b5ecc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9e3b5ecc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9e3b5ecc

Branch: refs/heads/master
Commit: 9e3b5ecc8cedd4c93dde00a0ae282404e31c4fcb
Parents: 05b73e4
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 12:10:24 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:16:24 2014 +0100

--
 .../org/apache/qpid/jms/provider/amqp/AmqpConsumer.java | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9e3b5ecc/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index d949b70..9c04a5a 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -32,6 +32,7 @@ import org.apache.qpid.jms.meta.JmsConsumerId;
 import org.apache.qpid.jms.meta.JmsConsumerInfo;
 import org.apache.qpid.jms.provider.AsyncResult;
 import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE;
+import org.apache.qpid.jms.provider.amqp.message.AmqpJmsMessageBuilder;
 import org.apache.qpid.jms.provider.ProviderListener;
 import org.apache.qpid.jms.util.IOExceptionSupport;
 import org.apache.qpid.proton.amqp.Binary;
@@ -49,8 +50,7 @@ import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
 import org.apache.qpid.proton.engine.Delivery;
 import org.apache.qpid.proton.engine.Receiver;
 import org.apache.qpid.proton.jms.EncodedMessage;
-import org.apache.qpid.proton.jms.InboundTransformer;
-import org.apache.qpid.proton.jms.JMSMappingInboundTransformer;
+import org.apache.qpid.proton.message.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,8 +66,6 @@ public class AmqpConsumer extends 
AbstractAmqpResourceJmsConsumerInfo, Receiver
 protected static final Symbol JMS_SELECTOR_SYMBOL = 
Symbol.valueOf(jms-selector);
 
 protected final AmqpSession session;
-protected final InboundTransformer inboundTransformer =
-new JMSMappingInboundTransformer(AmqpJMSVendor.INSTANCE);;
 protected final MapJmsInboundMessageDispatch, Delivery delivered = new 
LinkedHashMapJmsInboundMessageDispatch, Delivery();
 protected boolean presettle;
 
@@ -310,7 +308,10 @@ public class AmqpConsumer extends 
AbstractAmqpResourceJmsConsumerInfo, Receiver
 EncodedMessage encoded = readIncomingMessage(incoming);
 JmsMessage message = null;
 try {
-message = (JmsMessage) inboundTransformer.transform(encoded);
+Message protonMessage = Message.Factory.create();
+protonMessage.decode(encoded.getArray(), encoded.getArrayOffset(), 
encoded.getLength());
+
+message = (JmsMessage) 
AmqpJmsMessageBuilder.createJmsMessage(this, protonMessage);
 } catch (Exception e) {
 LOG.warn(Error on transform: {}, e.getMessage());
 // TODO - We could signal provider error but not sure we want to 
fail
@@ -431,6 +432,7 @@ public class AmqpConsumer extends 
AbstractAmqpResourceJmsConsumerInfo, Receiver
 buffer = streamBuffer.toByteArray();
 
 try {
+//TODO: get rid of EncodedMessage usage
 return new EncodedMessage(incoming.getMessageFormat(), buffer, 0, 
buffer.length);
 } finally {
 streamBuffer.reset();


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[04/11] git commit: fix empty list initialization on new stream message facades

[robbie]

fix empty list initialization on new stream message facades


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/88945f1c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/88945f1c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/88945f1c

Branch: refs/heads/master
Commit: 88945f1ce77cc51dbe97fbb79c7edf1cf41d4fee
Parents: 52e02b6
Author: Robert Gemmell rob...@apache.org
Authored: Sat Sep 27 17:41:17 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:09:37 2014 +0100

--
 .../amqp/message/AmqpJmsStreamMessageFacade.java  | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/88945f1c/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
index edf7ea0..0955aed 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
@@ -50,7 +50,7 @@ public class AmqpJmsStreamMessageFacade extends 
AmqpJmsMessageFacade implements
  */
 public AmqpJmsStreamMessageFacade(AmqpConnection connection) {
 super(connection);
-initializeEmptyList();
+list = initializeEmptyList();
 setAnnotation(JMS_MSG_TYPE, JMS_STREAM_MESSAGE);
 }
 
@@ -69,12 +69,12 @@ public class AmqpJmsStreamMessageFacade extends 
AmqpJmsMessageFacade implements
 
 Section body = getAmqpMessage().getBody();
 if (body == null) {
-initializeEmptyList();
+list = initializeEmptyList();
 } else if (body instanceof AmqpValue) {
 Object value = ((AmqpValue) body).getValue();
 
 if (value == null) {
-initializeEmptyList();
+list = initializeEmptyList();
 } else if (value instanceof List) {
 list = (ListObject) value;
 } else {
@@ -157,8 +157,10 @@ public class AmqpJmsStreamMessageFacade extends 
AmqpJmsMessageFacade implements
 return list.isEmpty();
 }
 
-private void initializeEmptyList() {
-ListObject list = new ArrayListObject();
-message.setBody(new AmqpValue(list));
+private ListObject initializeEmptyList() {
+ListObject emptyList = new ArrayListObject();
+message.setBody(new AmqpValue(emptyList));
+
+return emptyList;
 }
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[02/11] git commit: use the x-opt-jms-type annotation for transmitting the JMSType header

[robbie]

use the x-opt-jms-type annotation for transmitting the JMSType header


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6d80d99e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6d80d99e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6d80d99e

Branch: refs/heads/master
Commit: 6d80d99e29884230d5f1ba3be7f9d9968ef2911a
Parents: c294a3c
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 11:54:41 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:09:37 2014 +0100

--
 .../qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java   | 5 +++--
 .../qpid/jms/provider/amqp/message/AmqpMessageSupport.java | 6 --
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6d80d99e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 5a514b8..6f9cc97 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -19,6 +19,7 @@ package org.apache.qpid.jms.provider.amqp.message;
 import static 
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_AMQP_TTL;
 import static 
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_MESSAGE;
 import static 
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_MSG_TYPE;
+import static 
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_TYPE;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -495,12 +496,12 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 
 @Override
 public String getType() {
-return (String) getAnnotation(JMS_MSG_TYPE);
+return (String) getAnnotation(JMS_TYPE);
 }
 
 @Override
 public void setType(String type) {
-setAnnotation(JMS_MSG_TYPE, type);
+setAnnotation(JMS_TYPE, type);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6d80d99e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageSupport.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageSupport.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageSupport.java
index 70b1c57..0812208 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageSupport.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageSupport.java
@@ -81,12 +81,14 @@ public final class AmqpMessageSupport {
 public static final String JMS_APP_CORRELATION_ID = 
x-opt-app-correlation-id;
 
 /**
- * Attribute used to mark the JMSType value set on the message.
+ * Attribute used to mark the JMSType header string value set on the 
message by
+ * an application.
  */
 public static final String JMS_TYPE = x-opt-jms-type;
 
 /**
- * Attribute used to mark the JMS Type that the message instance 
represents.
+ * Attribute used to mark the class type of JMS message that a particular 
message
+ * instance represents, used internally by the client.
  */
 public static final String JMS_MSG_TYPE = x-opt-jms-msg-type;
 


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628215 - /qpid/proton/trunk/proton-c/src/windows/selector.c

[cliffjansen]

Author: cliffjansen
Date: Mon Sep 29 16:37:09 2014
New Revision: 1628215

URL: http://svn.apache.org/r1628215
Log:
PROTON-702: mark interest in timer based on existence of deadline, not change 
in deadline

Modified:
qpid/proton/trunk/proton-c/src/windows/selector.c

Modified: qpid/proton/trunk/proton-c/src/windows/selector.c
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/windows/selector.c?rev=1628215r1=1628214r2=1628215view=diff
==
--- qpid/proton/trunk/proton-c/src/windows/selector.c (original)
+++ qpid/proton/trunk/proton-c/src/windows/selector.c Mon Sep 29 16:37:09 2014
@@ -162,6 +162,9 @@ void pn_selector_update(pn_selector_t *s
 if (pn_selectable_pending(selectable)  0) {
   interests |= PN_WRITABLE;
 }
+if (selector-deadlines[idx]) {
+  interests |= PN_EXPIRED;
+}
 interests_update(iocpd, interests);
 deadlines_update(iocpd, selector-deadlines[idx]);
   }
@@ -245,13 +248,13 @@ int pn_selector_select(pn_selector_t *se
 
   selector-current = 0;
   selector-awoken = now;
-  selector-current_triggered = selector-triggered_list_head;
   for (iocpdesc_t *iocpd = selector-deadlines_head; iocpd; iocpd = 
iocpd-deadlines_next) {
 if (iocpd-deadline = now)
   pni_events_update(iocpd, iocpd-events | PN_EXPIRED);
 else
   break;
   }
+  selector-current_triggered = selector-triggered_list_head;
   return pn_error_code(selector-error);
 }
 
@@ -332,18 +335,17 @@ static void deadlines_update(iocpdesc_t 
 {
   if (deadline == iocpd-deadline)
 return;
+
   iocpd-deadline = deadline;
   pn_selector_t *selector = iocpd-selector;
   if (!deadline) {
 deadlines_remove(selector, iocpd);
 pni_events_update(iocpd, iocpd-events  ~PN_EXPIRED);
-interests_update(iocpd, iocpd-interests  ~PN_EXPIRED);
   } else {
 if (iocpd-deadlines_prev || selector-deadlines_head == iocpd) {
   deadlines_remove(selector, iocpd);
   pni_events_update(iocpd, iocpd-events  ~PN_EXPIRED);
 }
-interests_update(iocpd, iocpd-interests | PN_EXPIRED);
 iocpdesc_t *dl_iocpd = LL_HEAD(selector, deadlines);
 while (dl_iocpd  dl_iocpd-deadline = deadline)
   dl_iocpd = dl_iocpd-deadlines_next;



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

git commit: ensure facade copy includes consumer destination

[robbie]

Repository: qpid-jms
Updated Branches:
  refs/heads/master a83589eac - 0317483d4


ensure facade copy includes consumer destination


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0317483d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0317483d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0317483d

Branch: refs/heads/master
Commit: 0317483d4e8f1e876577edf8bb34202dc92b950f
Parents: a83589e
Author: Robert Gemmell rob...@apache.org
Authored: Mon Sep 29 17:39:46 2014 +0100
Committer: Robert Gemmell rob...@apache.org
Committed: Mon Sep 29 17:39:46 2014 +0100

--
 .../qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0317483d/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 6f9cc97..7aecbaa 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -246,6 +246,9 @@ public class AmqpJmsMessageFacade implements 
JmsMessageFacade {
 
 @SuppressWarnings(unchecked)
 protected void copyInto(AmqpJmsMessageFacade target) {
+if (consumerDestination != null) {
+target.consumerDestination = consumerDestination;
+}
 if (destination != null) {
 target.setDestination(destination);
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628232 - in /qpid/proton/branches/fadams-javascript-binding: examples/messenger/javascript/ proton-c/bindings/javascript/ proton-c/include/proton/ proton-c/src/windows/ tests/python/prot

[fadams]

Author: fadams
Date: Mon Sep 29 17:40:38 2014
New Revision: 1628232

URL: http://svn.apache.org/r1628232
Log:
Improve error handling a bit, still something of a work in progress

Modified:

qpid/proton/branches/fadams-javascript-binding/examples/messenger/javascript/send.html

qpid/proton/branches/fadams-javascript-binding/proton-c/bindings/javascript/messenger.js

qpid/proton/branches/fadams-javascript-binding/proton-c/bindings/javascript/module.js
qpid/proton/branches/fadams-javascript-binding/proton-c/include/proton/io.h
qpid/proton/branches/fadams-javascript-binding/proton-c/src/windows/iocp.c

qpid/proton/branches/fadams-javascript-binding/proton-c/src/windows/schannel.c

qpid/proton/branches/fadams-javascript-binding/tests/python/proton_tests/common.py

qpid/proton/branches/fadams-javascript-binding/tests/python/proton_tests/messenger.py

Modified: 
qpid/proton/branches/fadams-javascript-binding/examples/messenger/javascript/send.html
URL: 
http://svn.apache.org/viewvc/qpid/proton/branches/fadams-javascript-binding/examples/messenger/javascript/send.html?rev=1628232r1=1628231r2=1628232view=diff
==
--- 
qpid/proton/branches/fadams-javascript-binding/examples/messenger/javascript/send.html
 (original)
+++ 
qpid/proton/branches/fadams-javascript-binding/examples/messenger/javascript/send.html
 Mon Sep 29 17:40:38 2014
@@ -65,17 +65,20 @@ console.log(body =  + body);
 messenger.put(message);
 };
 
-messenger.on('error', function(error) {
+var errorHandler = function(error) {
 console.log(Received error  + error);
 
-// Error recovery seems to require a new Messenger instance.
-messenger.stop();
-messenger.free();
-messenger = new proton.Messenger();
-messenger.start();
-console.log(Restarted);
-});
+// Error recovery seems to require a new Messenger instance.
+messenger.stop();
+messenger.free();
+messenger = new proton.Messenger();
+
+messenger.on('error', errorHandler);
+messenger.start();
+console.log(Restarted);
+};
 
+messenger.on('error', errorHandler);
 messenger.start();
 
 /script

Modified: 
qpid/proton/branches/fadams-javascript-binding/proton-c/bindings/javascript/messenger.js
URL: 
http://svn.apache.org/viewvc/qpid/proton/branches/fadams-javascript-binding/proton-c/bindings/javascript/messenger.js?rev=1628232r1=1628231r2=1628232view=diff
==
--- 
qpid/proton/branches/fadams-javascript-binding/proton-c/bindings/javascript/messenger.js
 (original)
+++ 
qpid/proton/branches/fadams-javascript-binding/proton-c/bindings/javascript/messenger.js
 Mon Sep 29 17:40:38 2014
@@ -127,34 +127,6 @@ Module['Messenger'] = function(name) { /
 
 // This call ensures that the emscripten network callback functions are 
initialised.
 Module.EventDispatch.registerMessenger(this);
-
-
-// TODO improve error handling mechanism.
-/*
- * The emscripten websocket error event could get triggered by any 
Messenger
- * and it's hard to determine which one without knowing which file 
descriptors
- * are associated with which instance. As a workaround we set the 
_checkErrors
- * flag when we call put or subscribe and reset it when work succeeds.
- */
-this._checkErrors = false;
-
-/**
- * TODO update to handle multiple Messenger instances
- * Handle the emscripten websocket error and use it to trigger a 
MessengerError
- * Note that the emscripten websocket error passes an array containing the
- * file descriptor, the errno and the message, we just use the message 
here.
- */
-var that = this;
-Module['websocket']['on']('error', function(error) {
-
-console.log(Module['websocket']['on'] caller is  + 
arguments.callee.caller.toString());
-
-console.log(that._checkErrors =  + that._checkErrors);
-console.log(error =  + error);
-if (that._checkErrors) {
-that._emit('error', new Module['MessengerError'](error[2]));
-}
-});
 };
 
 Module['Messenger'].PN_CUMULATIVE = 0x1; // Protected Class attribute.
@@ -176,22 +148,21 @@ var _Messenger_ = Module['Messenger'].pr
  * @param {number} code the error code to check.
  */
 _Messenger_._check = function(code) {
-if (code  0) {
-if (code === Module['Error']['INPROGRESS']) {
-return code;
-}
-
+if (code  0  code !== Module['Error']['INPROGRESS']) {
 var errno = this['getErrno']();
 var message = errno ? this['getError']() : 
Pointer_stringify(_pn_code(code));
-
-if (this._callbacks['error']) {
-this._emit('error', new Module['MessengerError'](message));
-} else {
-throw new Module['MessengerError'](message);
+if (message !== 'PN_TIMEOUT') {
+if (this._callbacks['error']) {
+console.log(emitting  + message);
+this._emit('error', new 

svn commit: r1628259 - /qpid/proton/trunk/proton-c/bindings/python/proton.py

[rhs]

Author: rhs
Date: Mon Sep 29 19:00:41 2014
New Revision: 1628259

URL: http://svn.apache.org/r1628259
Log:
added connection accessor to proton binding

Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py

Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1628259r1=1628258r2=1628259view=diff
==
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Sep 29 19:00:41 
2014
@@ -3140,6 +3140,10 @@ The idle timeout of the connection (floa
   def condition(self):
 return cond2obj(pn_transport_condition(self._trans))
 
+  @property
+  def connection(self):
+return Connection._wrap_connection(pn_transport_connection(self._trans))
+
 class SASLException(TransportException):
   pass
 



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628274 - /qpid/proton/trunk/proton-c/src/codec/data.h

[mgoulish]

Author: mgoulish
Date: Mon Sep 29 19:44:05 2014
New Revision: 1628274

URL: http://svn.apache.org/r1628274
Log:
PROTON-700
By not saying 'static' on previous checkin, I broke debug builds.

Modified:
qpid/proton/trunk/proton-c/src/codec/data.h

Modified: qpid/proton/trunk/proton-c/src/codec/data.h
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/codec/data.h?rev=1628274r1=1628273r2=1628274view=diff
==
--- qpid/proton/trunk/proton-c/src/codec/data.h (original)
+++ qpid/proton/trunk/proton-c/src/codec/data.h Mon Sep 29 19:44:05 2014
@@ -61,7 +61,7 @@ struct pn_data_t {
   pni_nid_t base_current;
 };
 
-inline pni_node_t * pn_data_node(pn_data_t *data, pni_nid_t nd) 
+static inline pni_node_t * pn_data_node(pn_data_t *data, pni_nid_t nd) 
 {
   return nd ? (data-nodes + nd - 1) : NULL;
 }



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628289 - in /qpid/proton/trunk/proton-c: include/proton/transport.h src/engine/engine-internal.h src/transport/transport.c

[rhs]

Author: rhs
Date: Mon Sep 29 20:13:04 2014
New Revision: 1628289

URL: http://svn.apache.org/r1628289
Log:
add a backwords compatible pn_transport_error

Modified:
qpid/proton/trunk/proton-c/include/proton/transport.h
qpid/proton/trunk/proton-c/src/engine/engine-internal.h
qpid/proton/trunk/proton-c/src/transport/transport.c

Modified: qpid/proton/trunk/proton-c/include/proton/transport.h
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/transport.h?rev=1628289r1=1628288r2=1628289view=diff
==
--- qpid/proton/trunk/proton-c/include/proton/transport.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/transport.h Mon Sep 29 20:13:04 
2014
@@ -118,6 +118,11 @@ PN_EXTERN void pn_transport_free(pn_tran
 PN_EXTERN pn_condition_t *pn_transport_condition(pn_transport_t *transport);
 
 /**
+ * @deprecated
+ */
+PN_EXTERN  pn_error_t *pn_transport_error(pn_transport_t *transport);
+
+/**
  * Binds the transport to an AMQP connection.
  *
  * @return an error code, or 0 on success

Modified: qpid/proton/trunk/proton-c/src/engine/engine-internal.h
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine-internal.h?rev=1628289r1=1628288r2=1628289view=diff
==
--- qpid/proton/trunk/proton-c/src/engine/engine-internal.h (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine-internal.h Mon Sep 29 20:13:04 
2014
@@ -128,6 +128,7 @@ struct pn_transport_t {
   uint32_t   remote_max_frame;
   pn_condition_t remote_condition;
   pn_condition_t condition;
+  pn_error_t *error;
 
 #define PN_IO_SSL  0
 #define PN_IO_SASL 1

Modified: qpid/proton/trunk/proton-c/src/transport/transport.c
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/transport/transport.c?rev=1628289r1=1628288r2=1628289view=diff
==
--- qpid/proton/trunk/proton-c/src/transport/transport.c (original)
+++ qpid/proton/trunk/proton-c/src/transport/transport.c Mon Sep 29 20:13:04 
2014
@@ -164,6 +164,7 @@ static void pn_transport_initialize(void
   transport-disp_data = pn_data(0);
   pn_condition_init(transport-remote_condition);
   pn_condition_init(transport-condition);
+  transport-error = pn_error();
 
   transport-local_channels = pn_hash(PN_OBJECT, 0, 0.75);
   transport-remote_channels = pn_hash(PN_OBJECT, 0, 0.75);
@@ -258,6 +259,7 @@ static void pn_transport_finalize(void *
   pn_free(transport-disp_data);
   pn_condition_tini(transport-remote_condition);
   pn_condition_tini(transport-condition);
+  pn_error_free(transport-error);
   pn_free(transport-local_channels);
   pn_free(transport-remote_channels);
   if (transport-input_buf) free(transport-input_buf);
@@ -349,7 +351,15 @@ int pn_transport_unbind(pn_transport_t *
 
 pn_error_t *pn_transport_error(pn_transport_t *transport)
 {
-  return NULL;
+  assert(transport);
+  if (pn_condition_is_set(transport-condition)) {
+pn_error_format(transport-error, PN_ERR, %s: %s,
+pn_condition_get_name(transport-condition),
+pn_condition_get_description(transport-condition));
+  } else {
+pn_error_clear(transport-error);
+  }
+  return transport-error;
 }
 
 pn_condition_t *pn_transport_condition(pn_transport_t *transport)



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628292 - in /qpid/proton/trunk/proton-c/src/messenger: messenger.c messenger.c.orig

[rhs]

Author: rhs
Date: Mon Sep 29 20:20:46 2014
New Revision: 1628292

URL: http://svn.apache.org/r1628292
Log:
PROTON-676: applied patch from dominic

Added:
qpid/proton/trunk/proton-c/src/messenger/messenger.c.orig
  - copied, changed from r1628289, 
qpid/proton/trunk/proton-c/src/messenger/messenger.c
Modified:
qpid/proton/trunk/proton-c/src/messenger/messenger.c

Modified: qpid/proton/trunk/proton-c/src/messenger/messenger.c
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/messenger.c?rev=1628292r1=1628291r2=1628292view=diff
==
--- qpid/proton/trunk/proton-c/src/messenger/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger/messenger.c Mon Sep 29 20:20:46 
2014
@@ -239,7 +239,9 @@ static void pni_connection_readable(pn_s
 }
   }
 } else {
-  pn_transport_process(transport, (size_t) n);
+  int err = pn_transport_process(transport, (size_t)n);
+  if (err)
+pn_error_copy(messenger-error, pn_transport_error(transport));
 }
   }
 

Copied: qpid/proton/trunk/proton-c/src/messenger/messenger.c.orig (from 
r1628289, qpid/proton/trunk/proton-c/src/messenger/messenger.c)
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/messenger.c.orig?p2=qpid/proton/trunk/proton-c/src/messenger/messenger.c.origp1=qpid/proton/trunk/proton-c/src/messenger/messenger.cr1=1628289r2=1628292rev=1628292view=diff
==
(empty)



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

git commit: Remove use of the default message factory from the FailoverProvider and make it dependent on the connected instance for the message factory instance. Also adds a new event onConnectionEsta

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/master 0317483d4 - 6485baab5


Remove use of the default message factory from the FailoverProvider and
make it dependent on the connected instance for the message factory
instance.  Also adds a new event onConnectionEstablished which allows
the providers to know when chained that the next one in the series has
connected and allows for a client level event to indicate same.  

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6485baab
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6485baab
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6485baab

Branch: refs/heads/master
Commit: 6485baab519cce0cf5ebcdd6b6378d371548bb34
Parents: 0317483
Author: Timothy Bish tabish...@gmail.com
Authored: Mon Sep 29 16:34:26 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Mon Sep 29 16:34:26 2014 -0400

--
 .../java/org/apache/qpid/jms/JmsConnection.java |  19 +++-
 .../apache/qpid/jms/JmsConnectionListener.java  |  11 ++
 .../java/org/apache/qpid/jms/JmsSession.java|  22 ++--
 .../qpid/jms/provider/AbstractProvider.java |   7 ++
 .../jms/provider/DefaultProviderListener.java   |   4 +
 .../qpid/jms/provider/ProviderListener.java |  10 ++
 .../qpid/jms/provider/ProviderWrapper.java  |   5 +
 .../qpid/jms/provider/amqp/AmqpProvider.java|  21 +++-
 .../jms/provider/failover/FailoverProvider.java | 111 ---
 .../jms/discovery/JmsAmqpDiscoveryTest.java |   8 ++
 10 files changed, 163 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6485baab/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index b4d03af..cc2f979 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -64,9 +64,9 @@ import org.apache.qpid.jms.meta.JmsSessionId;
 import org.apache.qpid.jms.meta.JmsTransactionId;
 import org.apache.qpid.jms.provider.Provider;
 import org.apache.qpid.jms.provider.ProviderClosedException;
+import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE;
 import org.apache.qpid.jms.provider.ProviderFuture;
 import org.apache.qpid.jms.provider.ProviderListener;
-import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE;
 import org.apache.qpid.jms.util.IdGenerator;
 import org.apache.qpid.jms.util.ThreadPoolUtils;
 import org.slf4j.Logger;
@@ -525,7 +525,6 @@ public class JmsConnection implements Connection, 
TopicConnection, QueueConnecti
 
 this.connectionInfo = createResource(connectionInfo);
 this.connected.set(true);
-this.messageFactory = provider.getMessageFactory();
 
 // TODO - Advisory Support.
 //
@@ -977,6 +976,9 @@ public class JmsConnection implements Connection, 
TopicConnection, QueueConnecti
 }
 
 public JmsMessageFactory getMessageFactory() {
+if (messageFactory == null) {
+throw new RuntimeException(Message factory should never be null);
+}
 return messageFactory;
 }
 
@@ -1060,6 +1062,19 @@ public class JmsConnection implements Connection, 
TopicConnection, QueueConnecti
 }
 
 @Override
+public void onConnectionEstablished(URI remoteURI) {
+LOG.info(Connection {} connected to remote Broker: {}, 
connectionInfo.getConnectionId(), remoteURI);
+this.messageFactory = provider.getMessageFactory();
+
+// TODO - For events triggered from the Provider thread, we might want 
to consider always
+//firing the client level events on the Connection executor to 
prevent the client
+//from stalling the provider thread.
+for (JmsConnectionListener listener : connectionListeners) {
+listener.onConnectionEstablished(remoteURI);
+}
+}
+
+@Override
 public void onConnectionFailure(final IOException ex) {
 onAsyncException(ex);
 if (!closing.get()  !closed.get()) {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6485baab/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
index 2439760..d1a2663 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
+++ 

svn commit: r1628314 - /qpid/proton/trunk/proton-c/src/messenger/messenger.c.orig

[astitcher]

Author: astitcher
Date: Mon Sep 29 21:00:12 2014
New Revision: 1628314

URL: http://svn.apache.org/r1628314
Log:
PROTON-676: Removed file added in error

Removed:
qpid/proton/trunk/proton-c/src/messenger/messenger.c.orig


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r1628315 - in /qpid/proton/trunk: proton-c/bindings/python/proton.py tests/python/proton_tests/url.py

[astitcher]

Author: astitcher
Date: Mon Sep 29 21:02:37 2014
New Revision: 1628315

URL: http://svn.apache.org/r1628315
Log:
PROTON-693: If the system doesn't have port definitions for amqp/amqps
use the default values of 5672/5671.
- Not all systems have /etc/service (or similar) files that define
  these ports, but our tests use them and the defaults are these
  strings.

Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/tests/python/proton_tests/url.py

Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1628315r1=1628314r2=1628315view=diff
==
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Sep 29 21:02:37 
2014
@@ -3716,7 +3716,11 @@ class Url(object):
 try:
   return socket.getservbyname(value)
 except socket.error:
-  raise ValueError(Not a valid port number or service name: '%s' % 
value)
+  # Not every system has amqp/amqps defined as a service
+  if value == Url.AMQPS:  return 5671
+  elif value == Url.AMQP: return 5672
+  else:
+raise ValueError(Not a valid port number or service name: '%s' % 
value)
 
   def __init__(self, url=None, **kwargs):
 

Modified: qpid/proton/trunk/tests/python/proton_tests/url.py
URL: 
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/python/proton_tests/url.py?rev=1628315r1=1628314r2=1628315view=diff
==
--- qpid/proton/trunk/tests/python/proton_tests/url.py (original)
+++ qpid/proton/trunk/tests/python/proton_tests/url.py Mon Sep 29 21:02:37 2014
@@ -106,13 +106,6 @@ class UrlTest(common.Test):
 self.assertEqual(str(Url(s).defaults()), full)
 
 def testAmqps(self):
-Some old platforms don't recognize the amqps service name, this 
test is a no-op
-if that is the case otherwise verify we treat amqps correctly.
-try:
-Url.Port('amqps')
-except ValueError:
-print skipping: service 'amqps' not recognized on this platform
-return
 # Scheme defaults
 self.assertEqual(str(Url(me:secret@myhost/foobar).defaults()),
  amqp://me:secret@myhost:amqp/foobar)



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

git commit: Add some tests for property set intercepters

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/master d9803914a - 4f8e3da13


Add some tests for property set intercepters

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4f8e3da1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4f8e3da1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4f8e3da1

Branch: refs/heads/master
Commit: 4f8e3da138cb895e3d33533665794858bb73bab7
Parents: d980391
Author: Timothy Bish tabish...@gmail.com
Authored: Mon Sep 29 18:30:35 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Mon Sep 29 18:30:35 2014 -0400

--
 .../JmsMessagePropertyIntercepterTest.java  | 119 +++
 1 file changed, 119 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4f8e3da1/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
--
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index 63252c6..d3937a7 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -37,6 +37,8 @@ import static org.junit.Assert.assertTrue;
 
 import javax.jms.JMSException;
 
+import org.apache.qpid.jms.JmsDestination;
+import org.apache.qpid.jms.JmsQueue;
 import org.apache.qpid.jms.message.facade.JmsMessageFacade;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -57,6 +59,14 @@ public class JmsMessagePropertyIntercepterTest {
 Mockito.verify(message).getDestination();
 }
 
+@Test
+public void testSetJMSDestination() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsDestination queue = new JmsQueue(TestDestination);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DESTINATION, 
TestDestination);
+Mockito.verify(message).setDestination(queue);
+}
+
 //-- JMSReplyTo 
--//
 
 @Test
@@ -71,6 +81,14 @@ public class JmsMessagePropertyIntercepterTest {
 Mockito.verify(message).getReplyTo();
 }
 
+@Test
+public void testSetJMSReplyTo() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsDestination queue = new JmsQueue(TestDestination);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_REPLYTO, 
TestDestination);
+Mockito.verify(message).setReplyTo(queue);
+}
+
 //-- JMSType 
-//
 
 @Test
@@ -85,6 +103,13 @@ public class JmsMessagePropertyIntercepterTest {
 Mockito.verify(message).getType();
 }
 
+@Test
+public void testSetJMSType() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_TYPE, 
SomeType);
+Mockito.verify(message).setType(SomeType);
+}
+
 //-- JMSDeliveryMode 
-//
 
 @Test
@@ -99,6 +124,29 @@ public class JmsMessagePropertyIntercepterTest {
 Mockito.verify(message).isPersistent();
 }
 
+@Test
+public void testSetJMSDeliveryMode() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
PERSISTENT);
+Mockito.verify(message).setPersistent(true);
+Mockito.reset(message);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
NON_PERSISTENT);
+Mockito.verify(message).setPersistent(false);
+Mockito.reset(message);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
2);
+Mockito.verify(message).setPersistent(true);
+Mockito.reset(message);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
1);
+Mockito.verify(message).setPersistent(false);
+Mockito.reset(message);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
true);
+Mockito.verify(message).setPersistent(true);
+Mockito.reset(message);
+JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
false);
+Mockito.verify(message).setPersistent(false);
+Mockito.reset(message);
+}
+
 //-- JMSPriority -//
 
 

git commit: Adds additional tests for property get intercepters

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/master 4f8e3da13 - 065000dd7


Adds additional tests for property get intercepters

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/065000dd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/065000dd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/065000dd

Branch: refs/heads/master
Commit: 065000dd70bfabba4c4654c92e6898de9ffeb46a
Parents: 4f8e3da
Author: Timothy Bish tabish...@gmail.com
Authored: Mon Sep 29 18:51:44 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Mon Sep 29 18:51:44 2014 -0400

--
 .../JmsMessagePropertyIntercepterTest.java  | 114 +++
 1 file changed, 114 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/065000dd/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
--
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index d3937a7..f469956 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -60,6 +60,14 @@ public class JmsMessagePropertyIntercepterTest {
 }
 
 @Test
+public void testGetJMSDestinationWhenSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsDestination destination = new JmsQueue(TestDestination);
+Mockito.when(message.getDestination()).thenReturn(destination);
+assertEquals(destination.getName(), 
JmsMessagePropertyIntercepter.getProperty(message, JMS_DESTINATION));
+}
+
+@Test
 public void testSetJMSDestination() throws JMSException {
 JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
 JmsDestination queue = new JmsQueue(TestDestination);
@@ -82,6 +90,14 @@ public class JmsMessagePropertyIntercepterTest {
 }
 
 @Test
+public void testGetJMSReplyToWhenSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsDestination destination = new JmsQueue(TestDestination);
+Mockito.when(message.getReplyTo()).thenReturn(destination);
+assertEquals(destination.getName(), 
JmsMessagePropertyIntercepter.getProperty(message, JMS_REPLYTO));
+}
+
+@Test
 public void testSetJMSReplyTo() throws JMSException {
 JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
 JmsDestination queue = new JmsQueue(TestDestination);
@@ -104,6 +120,13 @@ public class JmsMessagePropertyIntercepterTest {
 }
 
 @Test
+public void testGetJMSTypeWhenSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+Mockito.when(message.getType()).thenReturn(MsgType);
+assertEquals(MsgType, 
JmsMessagePropertyIntercepter.getProperty(message, JMS_TYPE));
+}
+
+@Test
 public void testSetJMSType() throws JMSException {
 JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
 JmsMessagePropertyIntercepter.setProperty(message, JMS_TYPE, 
SomeType);
@@ -125,6 +148,20 @@ public class JmsMessagePropertyIntercepterTest {
 }
 
 @Test
+public void testGetJMSDeliverModeSetDurable() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+Mockito.when(message.isPersistent()).thenReturn(true);
+assertEquals(PERSISTENT, 
JmsMessagePropertyIntercepter.getProperty(message, JMS_DELIVERY_MODE));
+}
+
+@Test
+public void testGetJMSDeliverModeSetNonDurable() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+Mockito.when(message.isPersistent()).thenReturn(false);
+assertEquals(NON_PERSISTENT, 
JmsMessagePropertyIntercepter.getProperty(message, JMS_DELIVERY_MODE));
+}
+
+@Test
 public void testSetJMSDeliveryMode() throws JMSException {
 JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
 JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, 
PERSISTENT);
@@ -163,6 +200,13 @@ public class JmsMessagePropertyIntercepterTest {
 }
 
 @Test
+public void testGetJMSPriorityWhenSet() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+Mockito.when(message.getPriority()).thenReturn((byte) 9);
+assertEquals(9, 

svn commit: r1628336 [3/3] - in /qpid/branches/QPID-6125-ProtocolRefactoring/java: broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ broker-plugins/amqp-0-8-protocol

[rgodfrey]

Modified: 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java?rev=1628336r1=1628335r2=1628336view=diff
==
--- 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
 (original)
+++ 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
 Mon Sep 29 23:20:39 2014
@@ -30,39 +30,293 @@
 package org.apache.qpid.framing;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 import org.apache.qpid.codec.MarkableDataInput;
+import org.apache.qpid.protocol.AMQConstant;
 
-import java.util.Map;
-import java.util.HashMap;
 
-
-public abstract class MethodRegistry
+public final class MethodRegistry
 {
-private static final MapProtocolVersion, MethodRegistry _registries =
-new HashMapProtocolVersion, MethodRegistry();
+private static final MapProtocolVersion, MethodRegistry _registries = 
new HashMap();
 
 
 public static final MethodRegistry registry_0_9 =
-new org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9();
+new MethodRegistry(ProtocolVersion.v0_9);
 
 public static final MethodRegistry registry_0_91 =
-new org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91();
+new MethodRegistry(ProtocolVersion.v0_91);
 
 public static final MethodRegistry registry_8_0 =
-new org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0();
+new MethodRegistry(ProtocolVersion.v8_0);
+
+private final ProtocolVersion _protocolVersion;
 
-public abstract AMQMethodBody convertToBody(MarkableDataInput in, long 
size)
-throws AMQFrameDecodingException, IOException;
+public final AMQMethodBody convertToBody(MarkableDataInput in, long size)
+throws AMQFrameDecodingException, IOException
+{
+final int classAndMethod = in.readInt();
 
-public abstract int getMaxClassId();
+AMQMethodBody methodBody;
+switch(classAndMethod)
+{
+//CONNECTION_CLASS:
+case 0x000a000a:
+methodBody = new ConnectionStartBody(in);
+break;
+case 0x000a000b:
+methodBody = new ConnectionStartOkBody(in);
+break;
+case 0x000a0014:
+methodBody = new ConnectionSecureBody(in);
+break;
+case 0x000a0015:
+methodBody = new ConnectionSecureOkBody(in);
+break;
+case 0x000a001e:
+methodBody = new ConnectionTuneBody(in);
+break;
+case 0x000a001f:
+methodBody = new ConnectionTuneOkBody(in);
+break;
+case 0x000a0028:
+methodBody = new ConnectionOpenBody(in);
+break;
+case 0x000a0029:
+methodBody = new ConnectionOpenOkBody(in);
+break;
+case 0x000a002a:
+methodBody = new ConnectionRedirectBody(in, 
_protocolVersion);
+break;
+case 0x000a0032:
+if(_protocolVersion.equals(ProtocolVersion.v8_0))
+{
+methodBody = new ConnectionRedirectBody(in, 
_protocolVersion);
+}
+else
+{
+methodBody = new ConnectionCloseBody(in, 
_protocolVersion);
+}
+break;
+case 0x000a0033:
+if(_protocolVersion.equals(ProtocolVersion.v8_0))
+{
+throw newUnknownMethodException((classAndMethod  
16), (classAndMethod  0x));
+}
+else
+{
+methodBody = 
ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_9;
+}
+break;
+case 0x000a003c:
+if(_protocolVersion.equals(ProtocolVersion.v8_0))
+{
+methodBody = new ConnectionCloseBody(in, 
_protocolVersion);
+}
+else
+{
+throw 

svn commit: r1628336 [2/3] - in /qpid/branches/QPID-6125-ProtocolRefactoring/java: broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ broker-plugins/amqp-0-8-protocol

[rgodfrey]

Copied: 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
 (from r1628074, 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.javap1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.javar1=1628074r2=1628336rev=1628336view=diff
==
--- 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
 (original)
+++ 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
 Mon Sep 29 23:20:39 2014
@@ -25,29 +25,17 @@
  *   8-0
  */
 
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
 
 import org.apache.qpid.codec.MarkableDataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.qpid.framing.*;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;
 
-public class ChannelAlertBodyImpl extends AMQMethodBodyImpl implements 
ChannelAlertBody
+public class ChannelAlertBody extends AMQMethodBodyImpl implements 
EncodableAMQDataBlock, AMQMethodBody
 {
-private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new 
AMQMethodBodyInstanceFactory()
-{
-public AMQMethodBody newInstance(MarkableDataInput in, long size) 
throws AMQFrameDecodingException, IOException
-{
-return new ChannelAlertBodyImpl(in);
-}
-};
-
-public static AMQMethodBodyInstanceFactory getFactory()
-{
-return FACTORY_INSTANCE;
-}
 
 public static final int CLASS_ID =  20;
 public static final int METHOD_ID = 30;
@@ -58,18 +46,18 @@ public class ChannelAlertBodyImpl extend
 private final FieldTable _details; // [details]
 
 // Constructor
-public ChannelAlertBodyImpl(MarkableDataInput buffer) throws 
AMQFrameDecodingException, IOException
+public ChannelAlertBody(MarkableDataInput buffer) throws 
AMQFrameDecodingException, IOException
 {
 _replyCode = readUnsignedShort( buffer );
 _replyText = readAMQShortString( buffer );
 _details = readFieldTable( buffer );
 }
 
-public ChannelAlertBodyImpl(
-int replyCode,
-AMQShortString replyText,
-FieldTable details
-)
+public ChannelAlertBody(
+int replyCode,
+AMQShortString replyText,
+FieldTable details
+   )
 {
 _replyCode = replyCode;
 _replyText = replyText;

Modified: 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java?rev=1628336r1=1628335r2=1628336view=diff
==
--- 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
 (original)
+++ 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
 Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
 
 public class ChannelCloseBody extends AMQMethodBodyImpl implements 
EncodableAMQDataBlock, AMQMethodBody
 {
-private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new 
AMQMethodBodyInstanceFactory()
-{
-public AMQMethodBody newInstance(MarkableDataInput in, long size) 
throws AMQFrameDecodingException, IOException
-{
-return new ChannelCloseBody(in);
-}
-};
-
-public static AMQMethodBodyInstanceFactory getFactory()
-{
-return FACTORY_INSTANCE;
-}
 
 public static final int CLASS_ID =  20;
 public static final int METHOD_ID = 40;

Modified: 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java?rev=1628336r1=1628335r2=1628336view=diff
==
--- 

svn commit: r1628339 - in /qpid/branches/QPID-6125-ProtocolRefactoring/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/ bdbstore/src/test/java/org/apache/qpid/server/store

[rgodfrey]

Author: rgodfrey
Date: Mon Sep 29 23:40:11 2014
New Revision: 1628339

URL: http://svn.apache.org/r1628339
Log:
Remove remaining protocol specific classes/interfaces

Added:

qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java
  - copied, changed from r1628338, 
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
Removed:

qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/abstraction/

qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/

qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/

qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/
Modified:

qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_9.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_0_91.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java

qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java