Author: dkulp Date: Thu Mar 28 15:52:52 2013 New Revision: 1462170 URL: http://svn.apache.org/r1462170 Log: Merged revisions 1459934 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1459934 | gmazza | 2013-03-22 15:13:40 -0400 (Fri, 22 Mar 2013) | 9 lines Merged revisions 1459931 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1459931 | gmazza | 2013-03-22 15:10:28 -0400 (Fri, 22 Mar 2013) | 1 line Switched to new Apache Tomcat7 Maven plugin in java-first-jaxws sample. ........ ........ Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt?rev=1462170&r1=1462169&r2=1462170&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt Thu Mar 28 15:52:52 2013 @@ -19,20 +19,20 @@ To remove the code generated from the WS files, run "mvn clean". -Alternative: WAR deployment of service in a servlet container (e.g. Tomcat) +Alternative: WAR deployment of service to Tomcat (either embedded or standalone) --------------------------------------------------------------------------- 1.) Update the endpointAddress value in the client.Client class to the WAR-hosted value, for running this sample on your local machine most likely: "http://localhost:8080/java_first_jaxws/services/hello_world";. -2.) Manually copy the generated WAR file to the Tomcat webapps folder, or, if you -have Maven and Tomcat set up to use the Tomcat Maven Plugin -(http://mojo.codehaus.org/tomcat-maven-plugin/) you can use the mvn tomcat:redeploy -command instead. Important: if you're using this command and deploying on Tomcat 6 -instead of Tomcat 7, update the tomcat-maven-plugin configuration in the pom.xml, -switching to the the Tomcat 6-specific "url" element. +2.) Standalone Tomcat: Manually copy the generated WAR file to the Tomcat webapps folder, +or, if you have Maven and Tomcat set up to use the Tomcat Maven Plugin +(http://tomcat.apache.org/maven-plugin-2.1/tomcat7-maven-plugin/index.html) you can +use the mvn tomcat7:redeploy command instead. -Prior to running the client (mvn -Pclient) good to confirm the generated WSDL -can be seen from a web browser at: +For embedded Tomcat: Just run mvn tomcat7:run-war from the project base folder. + +Prior to running the client (mvn -Pclient) it would be good to confirm the +generated WSDL can be seen from a web browser at: http://localhost:8080/java_first_jaxws/services/hello_world?wsdl Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1462170&r1=1462169&r2=1462170&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml Thu Mar 28 15:52:52 2013 @@ -51,14 +51,11 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>tomcat-maven-plugin</artifactId> - <version>1.1</version> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.1</version> <configuration> <server>myTomcat</server> - <!-- if using Tomcat 6 (see README) --> - <!--url>http://localhost:8080/manager</url --> - <!-- if using Tomcat 7 (see README) --> <url>http://localhost:8080/manager/text</url> <path>/${project.build.finalName}</path> </configuration> Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java?rev=1462170&r1=1462169&r2=1462170&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java Thu Mar 28 15:52:52 2013 @@ -44,7 +44,8 @@ public final class Client { Service service = Service.create(SERVICE_NAME); // Endpoint Address String endpointAddress = "http://localhost:9000/helloWorld";; - // If web service deployed on Tomcat deployment, endpoint should be changed to: + // If web service deployed on Tomcat (either standalone or embedded) + // as described in sample README, endpoint should be changed to: // String endpointAddress = "http://localhost:8080/java_first_jaxws/services/hello_world";; // Add a port to the Service
