You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/11/14 20:07:59 UTC
svn commit: r1201827 - 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: dkulp
Date: Mon Nov 14 19:07:59 2011
New Revision: 1201827
URL: http://svn.apache.org/viewvc?rev=1201827&view=rev
Log:
Merged revisions 1188586 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1188586 | davsclaus | 2011-10-25 05:40:28 -0400 (Tue, 25 Oct 2011) | 1 line
Added release version to spring.schemas
........
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 Mon Nov 14 19:07:59 2011
@@ -1 +1 @@
-/camel/trunk:1201815
+/camel/trunk:1188586,1201815
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=1201827&r1=1201826&r2=1201827&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 Mon Nov 14 19:07:59 2011
@@ -33,5 +33,9 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.7.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.7.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.7.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.7.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.7.4.xsd=schema/cxfEndpoint.xsd
+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-${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=1201827&r1=1201826&r2=1201827&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 Mon Nov 14 19:07:59 2011
@@ -30,5 +30,9 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.7.4.xsd=schema/camel-spring-integration.xsd
+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-${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=1201827&r1=1201826&r2=1201827&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 Mon Nov 14 19:07:59 2011
@@ -24,5 +24,9 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.7.0.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.7.1.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.7.2.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.7.3.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.7.4.xsd=schema/camel-spring-security.xsd
+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-${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=1201827&r1=1201826&r2=1201827&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 Mon Nov 14 19:07:59 2011
@@ -32,7 +32,11 @@ http\://camel.apache.org/schema/spring/c
http\://camel.apache.org/schema/spring/camel-spring-2.7.0.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-2.7.1.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring/camel-spring-2.7.2.xsd=camel-spring.xsd
+http\://camel.apache.org/schema/spring/camel-spring-2.7.3.xsd=camel-spring.xsd
+http\://camel.apache.org/schema/spring/camel-spring-2.7.4.xsd=camel-spring.xsd
+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-${pom.version}.xsd=camel-spring.xsd
http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
@@ -50,5 +54,9 @@ http\://camel.apache.org/schema/osgi/cam
http\://camel.apache.org/schema/osgi/camel-osgi-2.7.0.xsd=camel-osgi.xsd
http\://camel.apache.org/schema/osgi/camel-osgi-2.7.1.xsd=camel-osgi.xsd
http\://camel.apache.org/schema/osgi/camel-osgi-2.7.2.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.7.3.xsd=camel-osgi.xsd
+http\://camel.apache.org/schema/osgi/camel-osgi-2.7.4.xsd=camel-osgi.xsd
+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-${pom.version}.xsd=camel-osgi.xsd