Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-6834: activemq-osgi should not include camel namespace in spring as they have been removed from Camel. Only blueprint is supported

This commit is contained in:
Claus Ibsen 2017-10-15 10:21:06 +02:00
parent 3cfa5cf7e2
commit 98a5e55a96
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-osgi/pom.xml
View File

@ -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>

3
activemq-osgi/src/main/resources/META-INF/spring.handlers
View File

@ -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

3
activemq-osgi/src/main/resources/META-INF/spring.schemas
View File

@ -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