Author: gmazza
Date: Fri Mar 22 18:21:35 2013
New Revision: 1459917
URL: http://svn.apache.org/r1459917
Log:
Switched to new Apache Tomcat7 Maven plugin in wsdl-first sample.
Modified:
cxf/trunk/distribution/src/main/release/samples/wsdl_first/README.txt
cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/README.txt?rev=1459917&r1=1459916&r2=1459917&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first/README.txt
(original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first/README.txt Fri
Mar 22 18:21:35 2013
@@ -79,30 +79,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/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=1459917&r1=1459916&r2=1459917&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml Fri Mar
22 18:21:35 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/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl?rev=1459917&r1=1459916&r2=1459917&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
(original)
+++
cxf/trunk/distribution/src/main/release/samples/wsdl_first/src/main/resources/CustomerService.wsdl
Fri Mar 22 18:21:35 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>