You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/11/24 04:15:29 UTC
svn commit: r1205714 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/resources/META-INF/
components/camel-spring-integration/src/main/resources/META-INF/
components/camel-spring-security/src/main/resources/META-INF/
components/camel-...
Author: ningjiang
Date: Thu Nov 24 03:15:28 2011
New Revision: 1205714
URL: http://svn.apache.org/viewvc?rev=1205714&view=rev
Log:
Merged revisions 1205713 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1205713 | ningjiang | 2011-11-24 11:02:57 +0800 (Thu, 24 Nov 2011) | 1 line
Updated the spring.schema version
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.8.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.8.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.8.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 24 03:15:28 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1205714&r1=1205713&r2=1205714&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas Thu Nov 24 03:15:28 2011
@@ -38,4 +38,5 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.8.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.8.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.8.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.8.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${pom.version}.xsd=schema/cxfEndpoint.xsd
Modified: camel/branches/camel-2.8.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1205714&r1=1205713&r2=1205714&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas (original)
+++ camel/branches/camel-2.8.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas Thu Nov 24 03:15:28 2011
@@ -35,4 +35,5 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.8.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${pom.version}.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
Modified: camel/branches/camel-2.8.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1205714&r1=1205713&r2=1205714&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas (original)
+++ camel/branches/camel-2.8.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas Thu Nov 24 03:15:28 2011
@@ -29,4 +29,5 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.8.0.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.8.1.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.8.2.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.8.3.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-${pom.version}.xsd=schema/camel-spring-security.xsd
\ No newline at end of file
Modified: camel/branches/camel-2.8.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring/src/main/resources/META-INF/spring.schemas?rev=1205714&r1=1205713&r2=1205714&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-spring/src/main/resources/META-INF/spring.schemas (original)
+++ camel/branches/camel-2.8.x/components/camel-spring/src/main/resources/META-INF/spring.schemas Thu Nov 24 03:15:28 2011
@@ -37,6 +37,7 @@ http\://camel.apache.org/schema/spring/c
http\://camel.apache.org/schema/spring/camel-spring-2.8.0.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-2.8.1.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-2.8.2.xsd=camel-spring.xsd
+http\://camel.apache.org/schema/spring/camel-spring-2.8.3.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-${pom.version}.xsd=camel-spring.xsd
http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
@@ -59,4 +60,5 @@ http\://camel.apache.org/schema/osgi/cam
http\://camel.apache.org/schema/osgi/camel-osgi-2.8.0.xsd=camel-osgi.xsd
http\://camel.apache.org/schema/osgi/camel-osgi-2.8.1.xsd=camel-osgi.xsd
http\://camel.apache.org/schema/osgi/camel-osgi-2.8.2.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.8.3.xsd=camel-osgi.xsd
http\://camel.apache.org/schema/osgi/camel-osgi-${pom.version}.xsd=camel-osgi.xsd