This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository activemq.
commit fbe3421da13462a82f5af0db675b131e60fee941 Author: Emmanuel Bourg <ebo...@apache.org> Date: Tue Dec 12 01:00:40 2017 +0100 Refreshed the patches --- debian/changelog | 8 +++++++ debian/patches/activemq-spring.patch | 45 +++++------------------------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8e457d..c5eee61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +activemq (5.15.2-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <ebo...@apache.org> Tue, 12 Dec 2017 00:49:26 +0100 + activemq (5.14.5-3) unstable; urgency=medium * Team upload. diff --git a/debian/patches/activemq-spring.patch b/debian/patches/activemq-spring.patch index 7b25738..2c7f5cf 100644 --- a/debian/patches/activemq-spring.patch +++ b/debian/patches/activemq-spring.patch @@ -10,40 +10,9 @@ Forwarded: not-needed .../org/apache/activemq/store/PersistenceAdapterFactoryBean.java | 5 ++--- 3 files changed, 9 insertions(+), 11 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..54dd496 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; +@@ -20,7 +20,7 @@ import javax.annotation.PreDestroy; import javax.jms.ConnectionFactory; import javax.transaction.TransactionManager; @@ -52,7 +21,7 @@ index 6a9de11..54dd496 100644 import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.FactoryBean; -@@ -48,7 +48,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { +@@ -48,7 +48,7 @@ private static final Logger LOGGER = LoggerFactory.getLogger(PooledConnectionFactoryBean.class); @@ -61,7 +30,7 @@ index 6a9de11..54dd496 100644 private ConnectionFactory connectionFactory; private int maxConnections = 1; private int maximumActive = 500; -@@ -115,7 +115,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { +@@ -115,7 +115,7 @@ * @org.apache.xbean.InitMethod */ public void afterPropertiesSet() throws Exception { @@ -70,7 +39,7 @@ index 6a9de11..54dd496 100644 try { LOGGER.debug("Trying to build a JcaPooledConnectionFactory"); JcaPooledConnectionFactory f = new JcaPooledConnectionFactory(); -@@ -156,7 +156,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { +@@ -156,7 +156,7 @@ } if (pooledConnectionFactory == null) { throw new IllegalStateException("Unable to create pooled connection factory. Enable DEBUG log level for more informations"); @@ -79,7 +48,7 @@ index 6a9de11..54dd496 100644 } /** -@@ -180,7 +180,6 @@ public class PooledConnectionFactoryBean implements FactoryBean { +@@ -180,7 +180,6 @@ */ public void destroy() throws Exception { if (pooledConnectionFactory != null) { @@ -87,8 +56,6 @@ index 6a9de11..54dd496 100644 pooledConnectionFactory = null; } } -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..431ae92 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 @@ @@ -100,7 +67,7 @@ index 0964024..431ae92 100644 import org.springframework.beans.factory.FactoryBean; /** -@@ -26,13 +26,12 @@ import org.springframework.beans.factory.FactoryBean; +@@ -26,13 +26,12 @@ * * */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits