activemq git commit: https://issues.apache.org/jira/browse/AMQ-5941

2015-08-24 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/master 11579bb91 -> d983d525c


https://issues.apache.org/jira/browse/AMQ-5941

Modifying ActiveMQResourceAdapter to implement Serializable to support
WebLogic.


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

Branch: refs/heads/master
Commit: d983d525ce22025dd6ad4b27e729e1a1917f06f5
Parents: 11579bb
Author: Christopher L. Shannon (cshannon) 
Authored: Mon Aug 24 13:02:02 2015 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Mon Aug 24 13:02:02 2015 +

--
 .../activemq/ra/ActiveMQResourceAdapter.java| 44 
 1 file changed, 27 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d983d525/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
--
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index 8c5d4ca..fd16603 100644
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ 
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.ra;
 
+import java.io.Serializable;
 import java.net.URI;
 import java.util.HashMap;
 
@@ -28,8 +29,8 @@ import javax.resource.spi.ResourceAdapterInternalException;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
-
 import javax.transaction.xa.Xid;
+
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.RedeliveryPolicy;
@@ -44,23 +45,24 @@ import org.slf4j.LoggerFactory;
  * Knows how to connect to one ActiveMQ server. It can then activate endpoints
  * and deliver messages to those end points using the connection configure in
  * the resource adapter. Must override equals and hashCode (JCA spec 16.4)
- * 
+ *
  * @org.apache.xbean.XBean element="resourceAdapter" rootElement="true"
  * description="The JCA Resource Adaptor for ActiveMQ"
- * 
+ *
  */
-public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport 
implements MessageResourceAdapter {
+public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport 
implements Serializable, MessageResourceAdapter {
+private static final long serialVersionUID = 360805587169336959L;
 private static final Logger LOG = 
LoggerFactory.getLogger(ActiveMQResourceAdapter.class);
-private final HashMap endpointWorkers = new 
HashMap();
+private transient final HashMap endpointWorkers = new 
HashMap();
 
-private BootstrapContext bootstrapContext;
+private transient BootstrapContext bootstrapContext;
 private String brokerXmlConfig;
-private BrokerService broker;
-private Thread brokerStartThread;
+private transient BrokerService broker;
+private transient Thread brokerStartThread;
 private ActiveMQConnectionFactory connectionFactory;
-
+
 /**
- * 
+ *
  */
 public ActiveMQResourceAdapter() {
 super();
@@ -69,6 +71,7 @@ public class ActiveMQResourceAdapter extends 
ActiveMQConnectionSupport implement
 /**
  * @see 
javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext)
  */
+@Override
 public void start(BootstrapContext bootstrapContext) throws 
ResourceAdapterInternalException {
 this.bootstrapContext = bootstrapContext;
 if (brokerXmlConfig != null && brokerXmlConfig.trim().length() > 0) {
@@ -80,7 +83,7 @@ public class ActiveMQResourceAdapter extends 
ActiveMQConnectionSupport implement
 log.debug("original thread context classLoader: " + 
Thread.currentThread().getContextClassLoader());
 
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 log.debug("current (from getClass()) thread context 
classLoader: " + Thread.currentThread().getContextClassLoader());
-
+
 synchronized( ActiveMQResourceAdapter.this ) {
 broker = BrokerFactory.createBroker(new 
URI(brokerXmlConfig));
 }
@@ -97,13 +100,13 @@ public class ActiveMQResourceAdapter extends 
ActiveMQConnectionSupport implement
 };
 brokerStartThread.setDaemon(true);
 brokerStartThread.start();
-
+

activemq git commit: https://issues.apache.org/jira/browse/AMQ-5941

2015-09-02 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.12.x 3619724d9 -> b5663bb0a


https://issues.apache.org/jira/browse/AMQ-5941

Modifying ActiveMQResourceAdapter to implement Serializable to support
WebLogic.

(cherry picked from commit d983d525ce22025dd6ad4b27e729e1a1917f06f5)


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

Branch: refs/heads/activemq-5.12.x
Commit: b5663bb0a97353f6c5b3f5365f1aea67fc150b55
Parents: 3619724
Author: Christopher L. Shannon (cshannon) 
Authored: Mon Aug 24 13:02:02 2015 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Wed Sep 2 20:09:00 2015 +

--
 .../activemq/ra/ActiveMQResourceAdapter.java| 44 
 1 file changed, 27 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/b5663bb0/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
--
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index 8c5d4ca..fd16603 100644
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ 
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.ra;
 
+import java.io.Serializable;
 import java.net.URI;
 import java.util.HashMap;
 
@@ -28,8 +29,8 @@ import javax.resource.spi.ResourceAdapterInternalException;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
-
 import javax.transaction.xa.Xid;
+
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.RedeliveryPolicy;
@@ -44,23 +45,24 @@ import org.slf4j.LoggerFactory;
  * Knows how to connect to one ActiveMQ server. It can then activate endpoints
  * and deliver messages to those end points using the connection configure in
  * the resource adapter. Must override equals and hashCode (JCA spec 16.4)
- * 
+ *
  * @org.apache.xbean.XBean element="resourceAdapter" rootElement="true"
  * description="The JCA Resource Adaptor for ActiveMQ"
- * 
+ *
  */
-public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport 
implements MessageResourceAdapter {
+public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport 
implements Serializable, MessageResourceAdapter {
+private static final long serialVersionUID = 360805587169336959L;
 private static final Logger LOG = 
LoggerFactory.getLogger(ActiveMQResourceAdapter.class);
-private final HashMap endpointWorkers = new 
HashMap();
+private transient final HashMap endpointWorkers = new 
HashMap();
 
-private BootstrapContext bootstrapContext;
+private transient BootstrapContext bootstrapContext;
 private String brokerXmlConfig;
-private BrokerService broker;
-private Thread brokerStartThread;
+private transient BrokerService broker;
+private transient Thread brokerStartThread;
 private ActiveMQConnectionFactory connectionFactory;
-
+
 /**
- * 
+ *
  */
 public ActiveMQResourceAdapter() {
 super();
@@ -69,6 +71,7 @@ public class ActiveMQResourceAdapter extends 
ActiveMQConnectionSupport implement
 /**
  * @see 
javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext)
  */
+@Override
 public void start(BootstrapContext bootstrapContext) throws 
ResourceAdapterInternalException {
 this.bootstrapContext = bootstrapContext;
 if (brokerXmlConfig != null && brokerXmlConfig.trim().length() > 0) {
@@ -80,7 +83,7 @@ public class ActiveMQResourceAdapter extends 
ActiveMQConnectionSupport implement
 log.debug("original thread context classLoader: " + 
Thread.currentThread().getContextClassLoader());
 
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 log.debug("current (from getClass()) thread context 
classLoader: " + Thread.currentThread().getContextClassLoader());
-
+
 synchronized( ActiveMQResourceAdapter.this ) {
 broker = BrokerFactory.createBroker(new 
URI(brokerXmlConfig));
 }
@@ -97,13 +100,13 @@ public class ActiveMQResourceAdapter extends 
ActiveMQConnectionSupport implement
 };
 brokerStartThr