This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository activemq.
commit 62e18a7e47040eb1ad8b27feafbf513d2c7b63e7 Author: Markus Koschany <[email protected]> Date: Sat Mar 19 16:36:55 2016 +0100 Add activemq-spring.patch --- debian/patches/activemq-spring.patch | 101 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 102 insertions(+) diff --git a/debian/patches/activemq-spring.patch b/debian/patches/activemq-spring.patch new file mode 100644 index 0000000..ac155b7 --- /dev/null +++ b/debian/patches/activemq-spring.patch @@ -0,0 +1,101 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 19 Mar 2016 16:36:23 +0100 +Subject: activemq-spring + +--- + .../org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java | 6 +++--- + .../org/apache/activemq/pool/PooledConnectionFactoryBean.java | 8 ++++---- + .../org/apache/activemq/store/PersistenceAdapterFactoryBean.java | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java b/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java +index 45c7bec..7fe0427 100644 +--- a/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java ++++ b/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java +@@ -23,7 +23,7 @@ import org.springframework.beans.BeansException; + import org.springframework.context.ApplicationContext; + import org.springframework.context.ApplicationContextAware; + import org.springframework.context.ConfigurableApplicationContext; +-import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; ++//import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; + + public class SpringOsgiContextHook implements Runnable, ApplicationContextAware { + +@@ -34,13 +34,13 @@ public class SpringOsgiContextHook implements Runnable, ApplicationContextAware + if (applicationContext instanceof ConfigurableApplicationContext) { + ((ConfigurableApplicationContext) applicationContext).close(); + } +- if (applicationContext instanceof OsgiBundleXmlApplicationContext){ ++ /*if (applicationContext instanceof OsgiBundleXmlApplicationContext){ + try { + ((OsgiBundleXmlApplicationContext)applicationContext).getBundle().stop(); + } catch (BundleException e) { + LOG.info("Error stopping OSGi bundle " + e, e); + } +- } ++ }*/ + + } + +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..0c89ffc 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 +@@ -20,7 +20,7 @@ import javax.annotation.PostConstruct; + import javax.annotation.PreDestroy; + import javax.jms.ConnectionFactory; + import javax.transaction.TransactionManager; +-import org.apache.activemq.jms.pool.PooledConnectionFactory; ++//import org.apache.activemq.jms.pool.PooledConnectionFactory; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.FactoryBean; +@@ -48,7 +48,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { + + private static final Logger LOGGER = LoggerFactory.getLogger(PooledConnectionFactoryBean.class); + +- private PooledConnectionFactory pooledConnectionFactory; ++ private Object pooledConnectionFactory = null; + private ConnectionFactory connectionFactory; + private int maxConnections = 1; + private int maximumActive = 500; +@@ -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/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java +index 0964024..8ace6d4 100644 +--- a/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java ++++ b/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java +@@ -16,7 +16,7 @@ + */ + package org.apache.activemq.store; + +-import org.apache.activemq.store.journal.JournalPersistenceAdapterFactory; ++//import org.apache.activemq.store.journal.JournalPersistenceAdapterFactory; + import org.springframework.beans.factory.FactoryBean; + + /** +@@ -26,7 +26,7 @@ import org.springframework.beans.factory.FactoryBean; + * + * + */ +-public class PersistenceAdapterFactoryBean extends JournalPersistenceAdapterFactory implements FactoryBean { ++public class PersistenceAdapterFactoryBean implements FactoryBean { + + private PersistenceAdapter persistenceAdaptor; + diff --git a/debian/patches/series b/debian/patches/series index 7fe3615..cbacda5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ exclude-jmdns.patch disable-broker-test-dependency.patch disable-jetty-all-dependency.patch init-debian-default-values.patch +activemq-spring.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
