You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2011/11/24 07:59:46 UTC
svn commit: r1205737 - in /camel/branches/camel-2.8.x: ./
apache-camel/src/main/descriptors/ examples/camel-example-cxf-blueprint/
examples/camel-example-cxf-osgi/ examples/camel-example-cxf-tomcat/
examples/camel-example-osgi/ examples/camel-example-r...
Author: ffang
Date: Thu Nov 24 06:59:44 2011
New Revision: 1205737
URL: http://svn.apache.org/viewvc?rev=1205737&view=rev
Log:
Merged revisions 1205735 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1205735 | ffang | 2011-11-24 14:39:03 +0800 (四, 24 11 2011) | 1 line
[CAMEL-4699]several examples README.txt use hardcode camel version
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml
camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml
camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/README.txt
camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/README.txt
camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/README.txt
camel/branches/camel-2.8.x/examples/camel-example-osgi/README.txt
camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/README.txt
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml Thu Nov 24 06:59:44 2011
@@ -46,6 +46,12 @@
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
<exclude>**/*.log</exclude>
+ <!-- exclude README.txt which need get filtered -->
+ <exclude>**/camel-example-reportincident-wssecurity/README.txt</exclude>
+ <exclude>**/camel-example-osgi/README.txt</exclude>
+ <exclude>**/camel-example-cxf-osgi/README.txt</exclude>
+ <exclude>**/camel-example-cxf-blueprint/README.txt</exclude>
+ <exclude>**/camel-example-cxf-tomcat/README.txt</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -70,6 +76,46 @@
</fileSet>
</fileSets>
+ <files>
+ <!--filtering README.txt-->
+ <file>
+ <source>../examples/camel-example-reportincident-wssecurity/README.txt</source>
+ <outputDirectory>/examples/camel-example-reportincident-wssecurity</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-osgi/README.txt</source>
+ <outputDirectory>/examples/camel-example-osgi</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-cxf-osgi/README.txt</source>
+ <outputDirectory>/examples/camel-example-cxf-osgi</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-cxf-blueprint/README.txt</source>
+ <outputDirectory>/examples/camel-example-cxf-blueprint</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-cxf-tomcat/README.txt</source>
+ <outputDirectory>/examples/camel-example-cxf-tomcat</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+
+
<componentDescriptors>
<componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
</componentDescriptors>
Modified: camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml Thu Nov 24 06:59:44 2011
@@ -46,6 +46,12 @@
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
<exclude>**/*.log</exclude>
+ <!-- exclude README.txt which need get filtered -->
+ <exclude>**/camel-example-reportincident-wssecurity/README.txt</exclude>
+ <exclude>**/camel-example-osgi/README.txt</exclude>
+ <exclude>**/camel-example-cxf-osgi/README.txt</exclude>
+ <exclude>**/camel-example-cxf-blueprint/README.txt</exclude>
+ <exclude>**/camel-example-cxf-tomcat/README.txt</exclude>
</excludes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -70,6 +76,45 @@
</fileSet>
</fileSets>
+ <files>
+ <!--filtering README.txt-->
+ <file>
+ <source>../examples/camel-example-reportincident-wssecurity/README.txt</source>
+ <outputDirectory>/examples/camel-example-reportincident-wssecurity</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-osgi/README.txt</source>
+ <outputDirectory>/examples/camel-example-osgi</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-cxf-osgi/README.txt</source>
+ <outputDirectory>/examples/camel-example-cxf-osgi</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-cxf-blueprint/README.txt</source>
+ <outputDirectory>/examples/camel-example-cxf-blueprint</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>../examples/camel-example-cxf-tomcat/README.txt</source>
+ <outputDirectory>/examples/camel-example-cxf-tomcat</outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ </files>
+
<componentDescriptors>
<componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
</componentDescriptors>
Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/README.txt
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/README.txt?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/README.txt (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/README.txt Thu Nov 24 06:59:44 2011
@@ -29,15 +29,13 @@ Note for Karaf 2.2.x:
javax.activation, javax.annotation, javax.xml.stream*.
2) Add features required
- features:addUrl mvn:org.apache.camel.karaf/apache-camel/2.9.0/xml/features
+ features:addUrl mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
features:install war
features:install cxf
features:install camel-jaxb
features:install camel-blueprint
features:install camel-cxf
- Note: Apache Camel 2.9.0 is being used above, but you should of course change the
- version number to the exact version of Camel being used.
3) Deploy the example
osgi:install -s mvn:org.apache.camel/camel-example-cxf-blueprint
Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/README.txt
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/README.txt?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/README.txt (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/README.txt Thu Nov 24 06:59:44 2011
@@ -37,19 +37,16 @@ Note for Karaf 2.2.x:
2) Add features required
-features:addUrl mvn:org.apache.camel.karaf/apache-camel/2.9.0/xml/features
+features:addUrl mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
features:install war
features:install cxf
features:install camel-spring
features:install camel-jaxb
features:install camel-cxf
-Note: Apache Camel 2.8.3 is being used above, but you should of course change the
- version number to the exact version of Camel being used.
-
3) Deploy the example
-osgi:install -s mvn:org.apache.camel/camel-example-cxf-osgi/2.8.3
+osgi:install -s mvn:org.apache.camel/camel-example-cxf-osgi/${version}
4) Verify that your service is available using the following url in the browser.
Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/README.txt
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/README.txt?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/README.txt (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-tomcat/README.txt Thu Nov 24 06:59:44 2011
@@ -11,8 +11,8 @@ You will need to package this example fi
To run the example deploy it in Apache Tomcat by copying the .war to the
deploy folder of Apache Tomcat.
-The webservice is located at (use correct version number)
- http://localhost:8080/camel-example-cxf-tomcat-2.5/webservices/incident?wsdl
+The webservice is located at
+ http://localhost:8080/camel-example-cxf-tomcat-${version}/webservices/incident?wsdl
This example is documented at
http://camel.apache.org/cxf-tomcat-example.html
Modified: camel/branches/camel-2.8.x/examples/camel-example-osgi/README.txt
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-osgi/README.txt?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-osgi/README.txt (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-osgi/README.txt Thu Nov 24 06:59:44 2011
@@ -29,9 +29,8 @@ You will need to compile and install thi
If using Apache Karaf / Apache ServiceMix you can install this example
from the shell
- osgi:install mvn:org.apache.camel/camel-example-osgi/2.5.0
+ osgi:install mvn:org.apache.camel/camel-example-osgi/${version}
- (substitute 2.5.0 with the Camel version number)
Then start the bundle by starting the id it was assigned during installation
Modified: camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/README.txt
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/README.txt?rev=1205737&r1=1205736&r2=1205737&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/README.txt (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/README.txt Thu Nov 24 06:59:44 2011
@@ -33,7 +33,7 @@ To run the example on Apache ServiceMix
They are required by the following bundle : org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/1.3.2_1
2) Add features required
- features:addUrl mvn:org.apache.camel.karaf/apache-camel/2.5-SNAPSHOT/xml/features
+ features:addUrl mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
features:install http
features:install camel
features:install camel-cxf