diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index a9e9124f7b..48b82a8ce4 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -162,10 +162,8 @@ ${project.groupId} activemq-web - ${project.version} - - org.apache.activemq + activemq-all @@ -211,7 +209,7 @@ - + org.apache.maven.plugins maven-dependency-plugin @@ -223,7 +221,15 @@ - + + org.apache.camel + camel-spring + ${camel-version} + jar + false + ${basedir}/target/extra-resources/ + camel-spring.xsd + org.apache.camel camel-blueprint diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers b/activemq-osgi/src/main/resources/META-INF/spring.handlers index 296c9e2553..900c754c9d 100644 --- a/activemq-osgi/src/main/resources/META-INF/spring.handlers +++ b/activemq-osgi/src/main/resources/META-INF/spring.handlers @@ -18,3 +18,5 @@ # 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 diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas index e36184d9bf..dd1b16d8d8 100644 --- a/activemq-osgi/src/main/resources/META-INF/spring.schemas +++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas @@ -57,6 +57,8 @@ 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/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