You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/12/30 22:47:24 UTC
camel git commit: Better stick to the 'accurately' given xsd through
the dependency chain instead of a given 'specific' one
Repository: camel
Updated Branches:
refs/heads/master 94f5694d8 -> d19aa64fe
Better stick to the 'accurately' given xsd through the dependency chain instead of a given 'specific' one
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d19aa64f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d19aa64f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d19aa64f
Branch: refs/heads/master
Commit: d19aa64fe473be31971ef31cdb30e1717fe33c44
Parents: 94f5694
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Dec 30 22:47:10 2014 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Dec 30 22:47:10 2014 +0100
----------------------------------------------------------------------
.../test/resources/org/apache/camel/component/jms/activemq.xml | 3 ---
.../org/apache/camel/component/jms/tx/activemq-security.xml | 3 ---
.../test/resources/org/apache/camel/component/jms/tx/activemq.xml | 3 ---
.../spring/issues/SpringPropertiesAvailableEverywhereTest.xml | 2 +-
.../src/main/resources/META-INF/spring/CxfRouteCamelContext.xml | 2 +-
.../src/main/resources/META-INF/spring/camel-context.xml | 2 +-
examples/camel-example-restlet-jdbc/src/main/resources/common.xml | 2 +-
.../camel-example-restlet-jdbc/src/main/resources/xml-dsl.xml | 2 +-
.../src/main/resources/META-INF/spring/camel-server.xml | 2 +-
.../org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml | 2 +-
.../test/resources/spring-config/server-WsAddressingContext.xml | 2 +-
.../test/resources/spring-config/server-applicationContext.xml | 2 +-
12 files changed, 9 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml
index a1f7de6..6e571ae 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml
@@ -23,9 +23,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
- <!-- you may want to use a specific activemq-core.xsd version
- that matches your broker, such as activemq-core-5.3.0.xsd -->
-
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker:broker useJmx="false" persistent="false" brokerName="localhost">
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq-security.xml
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq-security.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq-security.xml
index 44a6964..99834f1 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq-security.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq-security.xml
@@ -22,9 +22,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
- <!-- you may want to use a specific activemq-core.xsd version
- that matches your broker, such as activemq-core-5.3.0.xsd -->
-
<broker:broker id="broker" useJmx="false" brokerName="myBroker" persistent="false" dataDirectory="target/activemq">
<broker:plugins>
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
index 9ed4b06..3ae3e9d 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
@@ -22,9 +22,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
- <!-- you may want to use a specific activemq-core.xsd version
- that matches your broker, such as activemq-core-5.3.0.xsd -->
-
<broker:broker id="broker" useJmx="false" persistent="false" dataDirectory="target/activemq">
<broker:transportConnectors>
<broker:transportConnector name="openwire" uri="vm://localhost"/>
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
index ef579c8..08a30b6 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPropertiesAvailableEverywhereTest.xml
@@ -20,7 +20,7 @@
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml b/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
index 7b47b82..f1e1d49 100644
--- a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
+++ b/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
@@ -24,7 +24,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<broker:broker id="broker" useJmx="false" persistent="false" dataDirectory="target/activemq">
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
index 66a9c6d..fb9a263 100644
--- a/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd">
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<!-- create a CamelContext -->
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring" depends-on="broker">
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/examples/camel-example-restlet-jdbc/src/main/resources/common.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-restlet-jdbc/src/main/resources/common.xml b/examples/camel-example-restlet-jdbc/src/main/resources/common.xml
index 66baddd..44a9b8e 100644
--- a/examples/camel-example-restlet-jdbc/src/main/resources/common.xml
+++ b/examples/camel-example-restlet-jdbc/src/main/resources/common.xml
@@ -21,7 +21,7 @@ limitations under the License.
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
<bean id="RestletComponent" class="org.restlet.Component"/>
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/examples/camel-example-restlet-jdbc/src/main/resources/xml-dsl.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-restlet-jdbc/src/main/resources/xml-dsl.xml b/examples/camel-example-restlet-jdbc/src/main/resources/xml-dsl.xml
index d27f9a7..1ed18a0 100644
--- a/examples/camel-example-restlet-jdbc/src/main/resources/xml-dsl.xml
+++ b/examples/camel-example-restlet-jdbc/src/main/resources/xml-dsl.xml
@@ -22,7 +22,7 @@ limitations under the License.
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
<import resource="common.xml" />
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml b/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
index ba4e68e..befcf5b 100644
--- a/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
+++ b/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
@@ -23,7 +23,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd">
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<bean id="jmsConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL" value="tcp://localhost:51616"/>
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
index 353a389..1a79947 100644
--- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
+++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
@@ -41,7 +41,7 @@
<bean id="hdfs2" class="org.apache.camel.component.hdfs2.HdfsComponent" depends-on="hdfsOsgiHelper" />
- <camelContext xmlns="http://camel.apache.org/schema/blueprint" xsi:schemaLocation="http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint-2.12.2.xsd">
+ <camelContext xmlns="http://camel.apache.org/schema/blueprint" xsi:schemaLocation="http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
<!-- using Camel properties component and refer to the blueprint property placeholder by its id -->
<propertyPlaceholder id="properties" location="blueprint:external"
prefixToken="[[" suffixToken="]]"
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml b/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
index 6ae62da..dcb000b 100644
--- a/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
+++ b/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
@@ -5,7 +5,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd">
http://git-wip-us.apache.org/repos/asf/camel/blob/d19aa64f/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml b/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
index e2cf036..7828f22 100644
--- a/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
+++ b/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
@@ -21,7 +21,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd">