You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2016/04/27 09:48:56 UTC

camel git commit: Camel CDI: fix Camel XML configuration files schema location

Repository: camel
Updated Branches:
  refs/heads/master b41ac6274 -> 2b4d13f75


Camel CDI: fix Camel XML configuration files schema location


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b4d13f7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b4d13f7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b4d13f7

Branch: refs/heads/master
Commit: 2b4d13f75814ffe1d166d2a101d066d5770920e5
Parents: b41ac62
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Wed Apr 27 09:48:47 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Wed Apr 27 09:48:47 2016 +0200

----------------------------------------------------------------------
 .../camel-cdi/src/test/resources/camel-context-consumer.xml   | 5 ++++-
 .../camel-cdi/src/test/resources/camel-context-endpoint.xml   | 5 ++++-
 .../src/test/resources/camel-context-errorHandler-logging.xml | 5 ++++-
 .../src/test/resources/camel-context-errorHandler-policy.xml  | 5 ++++-
 .../camel-cdi/src/test/resources/camel-context-export.xml     | 5 ++++-
 .../camel-cdi/src/test/resources/camel-context-producer.xml   | 5 ++++-
 .../camel-cdi/src/test/resources/camel-context-properties.xml | 5 ++++-
 .../camel-cdi/src/test/resources/camel-context-proxy.xml      | 5 ++++-
 .../src/test/resources/camel-context-restContext.xml          | 7 ++++++-
 .../src/test/resources/camel-context-restContextRef.xml       | 5 ++++-
 .../camel-cdi/src/test/resources/camel-context-routes.xml     | 7 ++++++-
 11 files changed, 48 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-consumer.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-consumer.xml b/components/camel-cdi/src/test/resources/camel-context-consumer.xml
index 5404aa0..a5b206c 100644
--- a/components/camel-cdi/src/test/resources/camel-context-consumer.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-consumer.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <consumerTemplate id="consumer" maximumCacheSize="100"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-endpoint.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-endpoint.xml b/components/camel-cdi/src/test/resources/camel-context-endpoint.xml
index d9ad8c1..4b0a969 100644
--- a/components/camel-cdi/src/test/resources/camel-context-endpoint.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-endpoint.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <endpoint id="bar" uri="seda:inbound">
         <property key="queue" value="#queue"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-errorHandler-logging.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-errorHandler-logging.xml b/components/camel-cdi/src/test/resources/camel-context-errorHandler-logging.xml
index e7feb81..e2612d4 100644
--- a/components/camel-cdi/src/test/resources/camel-context-errorHandler-logging.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-errorHandler-logging.xml
@@ -16,7 +16,10 @@
     limitations under the License.
 -->
 <camelContext id="test" errorHandlerRef="error-handler"
-              xmlns="http://camel.apache.org/schema/spring">
+              xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <errorHandler id="error-handler"
                   type="LoggingErrorHandler"

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-errorHandler-policy.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-errorHandler-policy.xml b/components/camel-cdi/src/test/resources/camel-context-errorHandler-policy.xml
index 50a3807..9ac764f 100644
--- a/components/camel-cdi/src/test/resources/camel-context-errorHandler-policy.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-errorHandler-policy.xml
@@ -16,7 +16,10 @@
     limitations under the License.
 -->
 <camelContext id="test" errorHandlerRef="error-handler"
-              xmlns="http://camel.apache.org/schema/spring">
+              xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <errorHandler id="error-handler" redeliveryPolicyRef="policy"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-export.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-export.xml b/components/camel-cdi/src/test/resources/camel-context-export.xml
index 58be155..19617ad 100644
--- a/components/camel-cdi/src/test/resources/camel-context-export.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-export.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <export id="service" uri="direct:service"
             serviceRef="implementation"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-producer.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-producer.xml b/components/camel-cdi/src/test/resources/camel-context-producer.xml
index 34eb538..756cdc9 100644
--- a/components/camel-cdi/src/test/resources/camel-context-producer.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-producer.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <template id="inbound" defaultEndpoint="direct:inbound" maximumCacheSize="100"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-properties.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-properties.xml b/components/camel-cdi/src/test/resources/camel-context-properties.xml
index 15d0af4..66c30b6 100644
--- a/components/camel-cdi/src/test/resources/camel-context-properties.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-properties.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <propertyPlaceholder location="classpath:placeholder.properties"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-proxy.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-proxy.xml b/components/camel-cdi/src/test/resources/camel-context-proxy.xml
index 839dfb1..91035d9 100644
--- a/components/camel-cdi/src/test/resources/camel-context-proxy.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-proxy.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <proxy id="proxy"
            serviceInterface="org.apache.camel.cdi.bean.Service"

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-restContext.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-restContext.xml b/components/camel-cdi/src/test/resources/camel-context-restContext.xml
index 4f3cc93..f9f2aab 100644
--- a/components/camel-cdi/src/test/resources/camel-context-restContext.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-restContext.xml
@@ -15,10 +15,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<restContext id="rest" xmlns="http://camel.apache.org/schema/spring">
+<restContext id="rest" xmlns="http://camel.apache.org/schema/spring"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://camel.apache.org/schema/spring
+             http://camel.apache.org/schema/spring/camel-spring.xsd">
+
     <rest path="/inbound">
         <get>
             <to uri="direct:inbound"/>
         </get>
     </rest>
+
 </restContext>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-restContextRef.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-restContextRef.xml b/components/camel-cdi/src/test/resources/camel-context-restContextRef.xml
index 6511d30..53d406e 100644
--- a/components/camel-cdi/src/test/resources/camel-context-restContextRef.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-restContextRef.xml
@@ -15,7 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<camelContext id="test" xmlns="http://camel.apache.org/schema/spring">
+<camelContext id="test" xmlns="http://camel.apache.org/schema/spring"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://camel.apache.org/schema/spring
+              http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <restContextRef ref="rest"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b4d13f7/components/camel-cdi/src/test/resources/camel-context-routes.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/resources/camel-context-routes.xml b/components/camel-cdi/src/test/resources/camel-context-routes.xml
index 793ce3a..771b6b3 100644
--- a/components/camel-cdi/src/test/resources/camel-context-routes.xml
+++ b/components/camel-cdi/src/test/resources/camel-context-routes.xml
@@ -15,9 +15,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<routes xmlns="http://camel.apache.org/schema/spring">
+<routes xmlns="http://camel.apache.org/schema/spring"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://camel.apache.org/schema/spring
+        http://camel.apache.org/schema/spring/camel-spring.xsd">
+
     <route>
         <from uri="direct:inbound"/>
         <to uri="mock:outbound"/>
     </route>
+
 </routes>