cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1459931 - in /cxf/trunk/distribution/src/main/release/samples/java_first_jaxws: README.txt pom.xml src/main/java/demo/hw/client/Client.java
Date Fri, 22 Mar 2013 19:10:28 GMT
Author: gmazza
Date: Fri Mar 22 19:10:28 2013
New Revision: 1459931

URL: http://svn.apache.org/r1459931
Log:
Switched to new Apache Tomcat7 Maven plugin in java-first-jaxws sample.

Modified:
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt?rev=1459931&r1=1459930&r2=1459931&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt Fri Mar 22
19:10:28 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/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1459931&r1=1459930&r2=1459931&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml Fri Mar 22 19:10:28
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/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java?rev=1459931&r1=1459930&r2=1459931&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
Fri Mar 22 19:10:28 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



Mime
View raw message