svn commit: r1210316 - in /camel/trunk: apache-camel/src/main/descriptors/ examples/camel-example-cxf-tomcat/ examples/camel-example-cxf-tomcat/src/main/java/org/apache/camel/example/cxf/

[ningjiang]

Author: ningjiang
Date: Mon Dec  5 02:59:50 2011
New Revision: 1210316

URL: http://svn.apache.org/viewvc?rev=1210316&view=rev
Log:
CAMEL-4714 Applied the full patch of camel-example-cxf-tomcat

Modified:
    camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
    camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
    camel/trunk/examples/camel-example-cxf-tomcat/README.txt
    camel/trunk/examples/camel-example-cxf-tomcat/pom.xml
    
camel/trunk/examples/camel-example-cxf-tomcat/src/main/java/org/apache/camel/example/cxf/CamelRouteClient.java

Modified: camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=1210316&r1=1210315&r2=1210316&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Mon Dec  5 
02:59:50 2011
@@ -51,7 +51,6 @@
         <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>
@@ -106,13 +105,6 @@
       <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>
 
 

Modified: camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=1210316&r1=1210315&r2=1210316&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Mon Dec  5 
02:59:50 2011
@@ -51,7 +51,6 @@
         <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>
@@ -106,13 +105,6 @@
       <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>

Modified: camel/trunk/examples/camel-example-cxf-tomcat/README.txt
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-tomcat/README.txt?rev=1210316&r1=1210315&r2=1210316&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-tomcat/README.txt (original)
+++ camel/trunk/examples/camel-example-cxf-tomcat/README.txt Mon Dec  5 
02:59:50 2011
@@ -15,7 +15,7 @@ run "mvn tomcat:deploy" (also "tomcat:un
 to install the WAR file.  
 
 The webservice is located at
-  
http://localhost:8080/camel-example-cxf-tomcat-${version}/webservices/incident?wsdl
+  http://localhost:8080/camel-example-cxf-tomcat/webservices/incident?wsdl
 
 You can run a sample client using the "mvn exec:java" command, or, within
 soapUI, making sample SOAP requests such as the following:

Modified: camel/trunk/examples/camel-example-cxf-tomcat/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-tomcat/pom.xml?rev=1210316&r1=1210315&r2=1210316&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-tomcat/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-tomcat/pom.xml Mon Dec  5 02:59:50 
2011
@@ -58,6 +58,8 @@
                 </configuration>
             </plugin>
         </plugins>
+        <!-- Name of the generated WAR file -->
+        <finalName>camel-example-cxf-tomcat</finalName>
     </build>
 
     <dependencies>

Modified: 
camel/trunk/examples/camel-example-cxf-tomcat/src/main/java/org/apache/camel/example/cxf/CamelRouteClient.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-tomcat/src/main/java/org/apache/camel/example/cxf/CamelRouteClient.java?rev=1210316&r1=1210315&r2=1210316&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-cxf-tomcat/src/main/java/org/apache/camel/example/cxf/CamelRouteClient.java
 (original)
+++ 
camel/trunk/examples/camel-example-cxf-tomcat/src/main/java/org/apache/camel/example/cxf/CamelRouteClient.java
 Mon Dec  5 02:59:50 2011
@@ -25,9 +25,8 @@ import org.apache.cxf.frontend.ClientPro
 
 
 public class CamelRouteClient {
-       
-       // You may need to change the URL according to the Camel version 
-       private static final String URL = 
"http://localhost:8080/camel-example-cxf-tomcat-2.9-SNAPSHOT/webservices/incident";;
+
+    private static final String URL = 
"http://localhost:8080/camel-example-cxf-tomcat/webservices/incident";;
     
     protected static IncidentService createCXFClient() {
         // we use CXF to create a client for us as its easier than JAXWS and 
works