Author: gertv
Date: Sat Jun 28 05:21:22 2008
New Revision: 672500
URL: http://svn.apache.org/viewvc?rev=672500&view=rev
Log:
CAMEL-641: Wrong/missing entries in spring.schemas file
Modified:
activemq/camel/trunk/apache-camel/bundle/ (props changed)
activemq/camel/trunk/components/camel-bam/ (props changed)
activemq/camel/trunk/components/camel-cxf/pom.xml
activemq/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
activemq/camel/trunk/components/camel-osgi/pom.xml
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas
activemq/camel/trunk/components/camel-spring-integration/pom.xml
activemq/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Propchange: activemq/camel/trunk/apache-camel/bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jun 28 05:21:22 2008
@@ -1,3 +1,4 @@
.classpath
.project
+.settings
target
Propchange: activemq/camel/trunk/components/camel-bam/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jun 28 05:21:22 2008
@@ -5,4 +5,4 @@
.classpath
.project
.settings
-
+derby.log
Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=672500&r1=672499&r2=672500&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Sat Jun 28 05:21:22 2008
@@ -224,6 +224,16 @@
<build>
<defaultGoal>install</defaultGoal>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=672500&r1=672499&r2=672500&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Sat Jun 28 05:21:22 2008
@@ -19,6 +19,11 @@
#
#
http\://activemq.apache.org/camel/schema/cxfEndpoint/camel-cxf.xsd=schema/cxfEndpoint.xsd
+
# to support the camel-1.2's configuration
http\://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd=schema/cxfEndpoint.xsd
+# and for the other previous releases
+http\://activemq.apache.org/camel/schema/cxfEndpoint/camel-cxf-1.3.0.xsd=schema/cxfEndpoint.xsd
+http\://activemq.apache.org/camel/schema/cxfEndpoint/camel-cxf-${pom.version}.xsd=schema/cxfEndpoint.xsd
+
http\://cxf.apache.org/transports/camel.xsd=schema/configuration/camel.xsd
\ No newline at end of file
Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=672500&r1=672499&r2=672500&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Sat Jun 28 05:21:22 2008
@@ -112,6 +112,15 @@
</repositories>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
Modified:
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas?rev=672500&r1=672499&r2=672500&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas
(original)
+++
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas
Sat Jun 28 05:21:22 2008
@@ -17,7 +17,5 @@
http\://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
-http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.1.xsd=camel-osgi.xsd
-http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.1-SNAPSHOT.xsd=camel-osgi.xsd
-http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.2.xsd=camel-osgi.xsd
-http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.2-SNAPSHOT.xsd=camel-osgi.xsd
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.3.0.xsd=camel-osgi.xsd
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi-${pom.version}.xsd=camel-osgi.xsd
\ No newline at end of file
Modified: activemq/camel/trunk/components/camel-spring-integration/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/pom.xml?rev=672500&r1=672499&r2=672500&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring-integration/pom.xml Sat Jun 28
05:21:22 2008
@@ -40,6 +40,15 @@
<build>
<defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=672500&r1=672499&r2=672500&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Sat Jun 28 05:21:22 2008
@@ -15,4 +15,6 @@
# limitations under the License.
#
-http\://activemq.apache.org/camel/schema/spring/integration/camel-spring-integration.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
+http\://activemq.apache.org/camel/schema/spring/integration/camel-spring-integration.xsd=schema/camel-spring-integration.xsd
+
+http\://activemq.apache.org/camel/schema/spring/integration/camel-spring-integration-${pom.version}.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
