This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository activemq.
commit e49f97cbf6cf8113e2bd40f134c28c82bcb9fa63 Author: Markus Koschany <[email protected]> Date: Sat Mar 19 15:54:29 2016 +0100 Drop exclude-geronimo-jca.patch --- debian/patches/exclude-geronimo-jca.patch | 346 ------------------------------ debian/patches/series | 1 - 2 files changed, 347 deletions(-) diff --git a/debian/patches/exclude-geronimo-jca.patch b/debian/patches/exclude-geronimo-jca.patch deleted file mode 100644 index 59e0fc9..0000000 --- a/debian/patches/exclude-geronimo-jca.patch +++ /dev/null @@ -1,346 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Thu, 10 Mar 2016 16:43:47 +0100 -Subject: exclude geronimo jca - -We cannot build the jms-pool module yet because of missing dependencies. ---- - activemq-jms-pool/pom.xml | 17 ++ - .../activemq/jms/pool/GenericResourceManager.java | 199 --------------------- - .../activemq/jms/pool/JcaConnectionPool.java | 43 ----- - activemq-pool/pom.xml | 16 ++ - .../activemq/pool/PooledConnectionFactoryBean.java | 4 +- - 5 files changed, 35 insertions(+), 244 deletions(-) - delete mode 100644 activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/GenericResourceManager.java - delete mode 100644 activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/JcaConnectionPool.java - -diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml -index eb098c7..175f287 100755 ---- a/activemq-jms-pool/pom.xml -+++ b/activemq-jms-pool/pom.xml -@@ -41,6 +41,23 @@ - </activemq.osgi.export> - </properties> - -+ <build> -+ <plugins> -+ <plugin> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <configuration> -+ <excludes> -+ <exclude>**/JcaPooledConnectionFactory.java</exclude> -+ <exclude>**/JcaConnectionPool.java</exclude> -+ <exclude>**/ActiveMQResourceManager.java</exclude> -+ <exclude>**/GenericResourceManager.java</exclude> -+ </excludes> -+ </configuration> -+ </plugin> -+ </plugins> -+ </build> -+ -+ - <dependencies> - - <!-- =============================== --> -diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/GenericResourceManager.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/GenericResourceManager.java -deleted file mode 100644 -index 48963ac..0000000 ---- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/GenericResourceManager.java -+++ /dev/null -@@ -1,199 +0,0 @@ --/* -- * Licensed to the Apache Software Foundation (ASF) under one or more -- * contributor license agreements. See the NOTICE file distributed with -- * this work for additional information regarding copyright ownership. -- * The ASF licenses this file to You under the Apache License, Version 2.0 -- * (the "License"); you may not use this file except in compliance with -- * the License. You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --package org.apache.activemq.jms.pool; -- --import java.io.IOException; -- --import javax.jms.Connection; --import javax.jms.ConnectionFactory; --import javax.jms.XAConnection; --import javax.jms.XAConnectionFactory; --import javax.jms.XASession; --import javax.transaction.SystemException; --import javax.transaction.TransactionManager; -- --import javax.transaction.xa.XAResource; --import org.apache.geronimo.transaction.manager.NamedXAResourceFactory; --import org.slf4j.Logger; --import org.slf4j.LoggerFactory; --import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; --import org.apache.geronimo.transaction.manager.NamedXAResource; --import org.apache.geronimo.transaction.manager.WrapperNamedXAResource; -- -- --/** -- * This class allows wiring the ActiveMQ broker and the Geronimo transaction manager -- * in a way that will allow the transaction manager to correctly recover XA transactions. -- * -- * For example, it can be used the following way: -- * <pre> -- * <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"> -- * <property name="brokerURL" value="tcp://localhost:61616" /> -- * </bean> -- * -- * <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactoryFactoryBean"> -- * <property name="maxConnections" value="8" /> -- * <property name="transactionManager" ref="transactionManager" /> -- * <property name="connectionFactory" ref="activemqConnectionFactory" /> -- * <property name="resourceName" value="activemq.broker" /> -- * </bean> -- * -- * <bean id="resourceManager" class="org.apache.activemq.jms.pool.GenericResourceManager" init-method="recoverResource"> -- * <property name="transactionManager" ref="transactionManager" /> -- * <property name="connectionFactory" ref="activemqConnectionFactory" /> -- * <property name="resourceName" value="activemq.broker" /> -- * </bean> -- * </pre> -- */ --public class GenericResourceManager { -- -- private static final Logger LOGGER = LoggerFactory.getLogger(GenericResourceManager.class); -- -- private String resourceName; -- -- private String userName; -- private String password; -- -- private TransactionManager transactionManager; -- -- private ConnectionFactory connectionFactory; -- -- public void recoverResource() { -- try { -- if (!Recovery.recover(this)) { -- LOGGER.info("Resource manager is unrecoverable"); -- } -- } catch (NoClassDefFoundError e) { -- LOGGER.info("Resource manager is unrecoverable due to missing classes: " + e); -- } catch (Throwable e) { -- LOGGER.warn("Error while recovering resource manager", e); -- } -- } -- -- public String getPassword() { -- return password; -- } -- -- public void setPassword(String password) { -- this.password = password; -- } -- -- public String getUserName() { -- return userName; -- } -- -- public void setUserName(String userName) { -- this.userName = userName; -- } -- -- public String getResourceName() { -- return resourceName; -- } -- -- public void setResourceName(String resourceName) { -- this.resourceName = resourceName; -- } -- -- public TransactionManager getTransactionManager() { -- return transactionManager; -- } -- -- public void setTransactionManager(TransactionManager transactionManager) { -- this.transactionManager = transactionManager; -- } -- -- public ConnectionFactory getConnectionFactory() { -- return connectionFactory; -- } -- -- public void setConnectionFactory(ConnectionFactory connectionFactory) { -- this.connectionFactory = connectionFactory; -- } -- -- /** -- * This class will ensure the broker is properly recovered when wired with -- * the Geronimo transaction manager. -- */ -- public static class Recovery { -- -- public static boolean isRecoverable(GenericResourceManager rm) { -- return rm.getConnectionFactory() instanceof XAConnectionFactory && -- rm.getTransactionManager() instanceof RecoverableTransactionManager && -- rm.getResourceName() != null && !"".equals(rm.getResourceName()); -- } -- -- public static boolean recover(final GenericResourceManager rm) throws IOException { -- if (isRecoverable(rm)) { -- final XAConnectionFactory connFactory = (XAConnectionFactory) rm.getConnectionFactory(); -- -- RecoverableTransactionManager rtxManager = (RecoverableTransactionManager) rm.getTransactionManager(); -- rtxManager.registerNamedXAResourceFactory(new NamedXAResourceFactory() { -- -- @Override -- public String getName() { -- return rm.getResourceName(); -- } -- -- @Override -- public NamedXAResource getNamedXAResource() throws SystemException { -- try { -- final XAConnection xaConnection; -- if (rm.getUserName() != null && rm.getPassword() != null) { -- xaConnection = connFactory.createXAConnection(rm.getUserName(), rm.getPassword()); -- } else { -- xaConnection = connFactory.createXAConnection(); -- } -- final XASession session = xaConnection.createXASession(); -- xaConnection.start(); -- LOGGER.debug("new namedXAResource's connection: " + xaConnection); -- -- return new ConnectionAndWrapperNamedXAResource(session.getXAResource(), getName(), xaConnection); -- } catch (Exception e) { -- SystemException se = new SystemException("Failed to create ConnectionAndWrapperNamedXAResource, " + e.getLocalizedMessage()); -- se.initCause(e); -- LOGGER.error(se.getLocalizedMessage(), se); -- throw se; -- } -- } -- -- @Override -- public void returnNamedXAResource(NamedXAResource namedXaResource) { -- if (namedXaResource instanceof ConnectionAndWrapperNamedXAResource) { -- try { -- LOGGER.debug("closing returned namedXAResource's connection: " + ((ConnectionAndWrapperNamedXAResource)namedXaResource).connection); -- ((ConnectionAndWrapperNamedXAResource)namedXaResource).connection.close(); -- } catch (Exception ignored) { -- LOGGER.debug("failed to close returned namedXAResource: " + namedXaResource, ignored); -- } -- } -- } -- }); -- return true; -- } else { -- return false; -- } -- } -- } -- -- public static class ConnectionAndWrapperNamedXAResource extends WrapperNamedXAResource { -- final Connection connection; -- public ConnectionAndWrapperNamedXAResource(XAResource xaResource, String name, Connection connection) { -- super(xaResource, name); -- this.connection = connection; -- } -- } --} -diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/JcaConnectionPool.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/JcaConnectionPool.java -deleted file mode 100644 -index 80ec2b9..0000000 ---- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/JcaConnectionPool.java -+++ /dev/null -@@ -1,43 +0,0 @@ --/* -- * Copyright 2006 the original author or authors. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --package org.apache.activemq.jms.pool; -- --import javax.jms.Connection; --import javax.jms.JMSException; --import javax.jms.XASession; --import javax.transaction.TransactionManager; --import javax.transaction.xa.XAResource; -- --import org.apache.geronimo.transaction.manager.WrapperNamedXAResource; -- --public class JcaConnectionPool extends XaConnectionPool { -- -- private final String name; -- -- public JcaConnectionPool(Connection connection, TransactionManager transactionManager, String name) { -- super(connection, transactionManager); -- this.name = name; -- } -- -- @Override -- protected XAResource createXaResource(PooledSession session) throws JMSException { -- XAResource xares = ((XASession)session.getInternalSession()).getXAResource(); -- if (name != null) { -- xares = new WrapperNamedXAResource(xares, name); -- } -- return xares; -- } --} -diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml -index d15bf39..ea00e6d 100755 ---- a/activemq-pool/pom.xml -+++ b/activemq-pool/pom.xml -@@ -42,6 +42,22 @@ - </activemq.osgi.export> - </properties> - -+ <build> -+ <plugins> -+ <plugin> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <configuration> -+ <excludes> -+ <exclude>**/JcaPooledConnectionFactory.java</exclude> -+ <exclude>**/JcaConnectionPool.java</exclude> -+ <exclude>**/ActiveMQResourceManager.java</exclude> -+ </excludes> -+ </configuration> -+ </plugin> -+ </plugins> -+ </build> -+ -+ - <dependencies> - - <!-- =============================== --> -diff --git a/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java -index 6a9de11..63cc7ea 100644 ---- a/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java -+++ b/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java -@@ -115,7 +115,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { - * @org.apache.xbean.InitMethod - */ - public void afterPropertiesSet() throws Exception { -- if (pooledConnectionFactory == null && transactionManager != null && resourceName != null) { -+ /*if (pooledConnectionFactory == null && transactionManager != null && resourceName != null) { - try { - LOGGER.debug("Trying to build a JcaPooledConnectionFactory"); - JcaPooledConnectionFactory f = new JcaPooledConnectionFactory(); -@@ -128,7 +128,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { - } catch (Throwable t) { - LOGGER.debug("Could not create JCA enabled connection factory: " + t, t); - } -- } -+ }*/ - if (pooledConnectionFactory == null && transactionManager != null) { - try { - LOGGER.debug("Trying to build a XaPooledConnectionFactory"); diff --git a/debian/patches/series b/debian/patches/series index 6d8c29d..16296e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -exclude-geronimo-jca.patch exclude-jmdns.patch disable-broker-test-dependency.patch disable-jetty-all-dependency.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
