activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: AMQ-6834 - Adding back in spring schemas for camel
Date Mon, 16 Oct 2017 13:22:47 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 98a5e55a9 -> 0c396a23e


AMQ-6834 - Adding back in spring schemas for camel


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0c396a23
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0c396a23
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0c396a23

Branch: refs/heads/master
Commit: 0c396a23e761c9371edacbdbddff891fcc0e3a04
Parents: 98a5e55
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Mon Oct 16 09:20:36 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Mon Oct 16 09:21:59 2017 -0400

----------------------------------------------------------------------
 activemq-osgi/pom.xml                               | 16 +++++++++++-----
 .../src/main/resources/META-INF/spring.handlers     |  2 ++
 .../src/main/resources/META-INF/spring.schemas      |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/0c396a23/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 464994c..9a406f0 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -162,10 +162,8 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
-      <version>${project.version}</version>
       <exclusions>
-        <exclusion>
-          <groupId>org.apache.activemq</groupId>
+      <exclusion>
           <artifactId>activemq-all</artifactId>
         </exclusion>
       </exclusions>
@@ -211,7 +209,7 @@
       </resource>
     </resources>
     <plugins>
-      <!-- get camel core blueprint schema info -->
+      <!-- get camel core spring schema info -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -223,7 +221,15 @@
             </goals>
             <configuration>
               <artifactItems>
-                <!-- only camel-blueprint is supported with XML in OSGi with Camel -->
+                <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>
                 <artifactItem>
                   <groupId>org.apache.camel</groupId>
                   <artifactId>camel-blueprint</artifactId>

http://git-wip-us.apache.org/repos/asf/activemq/blob/0c396a23/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 296c9e2..900c754 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

http://git-wip-us.apache.org/repos/asf/activemq/blob/0c396a23/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 e36184d..dd1b16d 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


Mime
View raw message