Author: dkulp Date: Thu Mar 28 15:52:48 2013 New Revision: 1462168 URL: http://svn.apache.org/r1462168 Log: Merged revisions 1459922 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1459922 | gmazza | 2013-03-22 14:37:16 -0400 (Fri, 22 Mar 2013) | 9 lines Merged revisions 1459917 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1459917 | gmazza | 2013-03-22 14:21:35 -0400 (Fri, 22 Mar 2013) | 1 line Switched to new Apache Tomcat7 Maven plugin in wsdl-first sample. ........ ........ Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/README.txt cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/README.txt?rev=1462168&r1=1462167&r2=1462168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/README.txt (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/README.txt Thu Mar 28 15:52:48 2013 @@ -75,27 +75,31 @@ located), the pom.xml file is used to bu Using either UNIX or Windows: mvn clean install (builds the demo and creates a WAR file for optional Tomcat deployment) - mvn -Pserver (from one command line window -- only if using a standalone service, i.e., embedded Jetty) + mvn -Pserver (from one command line window -- only if using embedded Jetty) mvn -Pclient (from a second command line window) +There is no special Maven profile for the Spring client and server but you can +easily set it up yourself. -If you're using Tomcat for the web service provider: +If you're using Tomcat (embedded or standalone) for the web service provider: ---------------------------------------------------- 1.) Update the soap:address value in the resources/CustomerService.wsdl value, switching the soap:address value to the servlet-specific one (presently commented-out). -2.) You can 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 are using 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.) For standalone Tomcat: You can 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. + +For embedded Tomcat: Just run mvn tomcat7:run-war from the project base folder. + +3.) Next activate the client via mvn -Pclient as explained in the previous section. -To remove the code generated from the WSDL file and the .class files, run "mvn clean". There is no special Maven profile for the spring client and server but you can easily set it up yourself. + Using Eclipse to run and test the demo -------------------------------------- Run the following in the demo base directory Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=1462168&r1=1462167&r2=1462168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/pom.xml Thu Mar 28 15:52:48 2013 @@ -56,14 +56,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/wsdl_first/src/main/resources/CustomerService.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl?rev=1462168&r1=1462167&r2=1462168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl Thu Mar 28 15:52:48 2013 @@ -119,7 +119,7 @@ <wsdl:port name="CustomerServicePort" binding="tns:CustomerServiceServiceSoapBinding"> <!-- embedded deployment --> <soap:address location="http://localhost:9090/CustomerServicePort"/> - <!-- standalone Tomcat deployment --> + <!-- Tomcat deployment, embedded or standalone --> <!--soap:address location="http://localhost:8080/wsdl_first/services/CustomerServicePort"/--> </wsdl:port> </wsdl:service>
