You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2017/10/15 08:21:41 UTC
[1/2] activemq git commit: AMQ-6834: activemq-osgi should not include
camel namespace in spring as they have been removed from Camel. Only
blueprint is supported
Repository: activemq
Updated Branches:
refs/heads/activemq-5.15.x d66e96e8b -> b27b4d9a3
refs/heads/master 3cfa5cf7e -> 98a5e55a9
AMQ-6834: activemq-osgi should not include camel namespace in spring as they have been removed from Camel. Only blueprint is supported
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/98a5e55a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/98a5e55a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/98a5e55a
Branch: refs/heads/master
Commit: 98a5e55a9676f6857aefed5a0d4a364ba4920375
Parents: 3cfa5cf
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sun Oct 15 10:21:06 2017 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sun Oct 15 10:21:06 2017 +0200
----------------------------------------------------------------------
activemq-osgi/pom.xml | 16 +++++-----------
.../src/main/resources/META-INF/spring.handlers | 3 ---
.../src/main/resources/META-INF/spring.schemas | 3 ---
3 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/98a5e55a/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9a406f0..464994c 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -162,8 +162,10 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId>
+ <version>${project.version}</version>
<exclusions>
- <exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
</exclusion>
</exclusions>
@@ -209,7 +211,7 @@
</resource>
</resources>
<plugins>
- <!-- get camel core spring schema info -->
+ <!-- get camel core blueprint schema info -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -221,15 +223,7 @@
</goals>
<configuration>
<artifactItems>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel-version}</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${basedir}/target/extra-resources/</outputDirectory>
- <includes>camel-spring.xsd</includes>
- </artifactItem>
+ <!-- only camel-blueprint is supported with XML in OSGi with Camel -->
<artifactItem>
<groupId>org.apache.camel</groupId>
<artifactId>camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/98a5e55a/activemq-osgi/src/main/resources/META-INF/spring.handlers
----------------------------------------------------------------------
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers b/activemq-osgi/src/main/resources/META-INF/spring.handlers
index cedad63..296c9e2 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.handlers
+++ b/activemq-osgi/src/main/resources/META-INF/spring.handlers
@@ -18,6 +18,3 @@
# manual creation to include camel handler so we can embed camel context in xbean xml config
#
http\://activemq.apache.org/schema/core=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
-http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/spring/v2.10=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/osgi=org.apache.camel.osgi.CamelNamespaceHandler
http://git-wip-us.apache.org/repos/asf/activemq/blob/98a5e55a/activemq-osgi/src/main/resources/META-INF/spring.schemas
----------------------------------------------------------------------
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 2547616..e36184d 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -57,9 +57,6 @@ http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
-http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
-http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
-
http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd
http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd
[2/2] activemq git commit: AMQ-6834: activemq-osgi should not include
camel namespace in spring as they have been removed from Camel. Only
blueprint is supported
Posted by da...@apache.org.
AMQ-6834: activemq-osgi should not include camel namespace in spring as they have been removed from Camel. Only blueprint is supported
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b27b4d9a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b27b4d9a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b27b4d9a
Branch: refs/heads/activemq-5.15.x
Commit: b27b4d9a3338945125cc64ead87ea65fba785fd5
Parents: d66e96e
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sun Oct 15 10:21:06 2017 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sun Oct 15 10:21:33 2017 +0200
----------------------------------------------------------------------
activemq-osgi/pom.xml | 16 +++++-----------
.../src/main/resources/META-INF/spring.handlers | 3 ---
.../src/main/resources/META-INF/spring.schemas | 3 ---
3 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b27b4d9a/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 48b82a8..a9e9124 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -162,8 +162,10 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId>
+ <version>${project.version}</version>
<exclusions>
- <exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
</exclusion>
</exclusions>
@@ -209,7 +211,7 @@
</resource>
</resources>
<plugins>
- <!-- get camel core spring schema info -->
+ <!-- get camel core blueprint schema info -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -221,15 +223,7 @@
</goals>
<configuration>
<artifactItems>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel-version}</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${basedir}/target/extra-resources/</outputDirectory>
- <includes>camel-spring.xsd</includes>
- </artifactItem>
+ <!-- only camel-blueprint is supported with XML in OSGi with Camel -->
<artifactItem>
<groupId>org.apache.camel</groupId>
<artifactId>camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/b27b4d9a/activemq-osgi/src/main/resources/META-INF/spring.handlers
----------------------------------------------------------------------
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers b/activemq-osgi/src/main/resources/META-INF/spring.handlers
index cedad63..296c9e2 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.handlers
+++ b/activemq-osgi/src/main/resources/META-INF/spring.handlers
@@ -18,6 +18,3 @@
# manual creation to include camel handler so we can embed camel context in xbean xml config
#
http\://activemq.apache.org/schema/core=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
-http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/spring/v2.10=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/osgi=org.apache.camel.osgi.CamelNamespaceHandler
http://git-wip-us.apache.org/repos/asf/activemq/blob/b27b4d9a/activemq-osgi/src/main/resources/META-INF/spring.schemas
----------------------------------------------------------------------
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 2547616..e36184d 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -57,9 +57,6 @@ http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
-http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
-http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
-
http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd
http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd