You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2018/03/23 09:39:57 UTC

[cxf] branch master updated: add Tomcat 8 in Maven for this sample

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 013d394  add Tomcat 8 in Maven for this sample
013d394 is described below

commit 013d39414d507c72928acae20718bef86be2a5be
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Fri Mar 23 10:39:28 2018 +0100

    add Tomcat 8 in Maven for this sample
---
 .../release/samples/java_first_jaxws/README.txt    |  5 +--
 .../main/release/samples/java_first_jaxws/pom.xml  | 38 +++++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/distribution/src/main/release/samples/java_first_jaxws/README.txt b/distribution/src/main/release/samples/java_first_jaxws/README.txt
index e563acd..c90ca4c 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/README.txt
+++ b/distribution/src/main/release/samples/java_first_jaxws/README.txt
@@ -27,10 +27,11 @@ value, for running this sample on your local machine most likely:
 
 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
+(http://tomcat.apache.org/maven-plugin-2.2/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.
+For embedded Tomcat 7: Just run mvn tomcat7:run-war from the project base folder.
+For embedded Tomcat 8: Just run mvn cargo:run 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:
diff --git a/distribution/src/main/release/samples/java_first_jaxws/pom.xml b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
index 5b1bba2..5488b73 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
@@ -31,6 +31,7 @@
     <properties>
         <cxf.version>${project.version}</cxf.version>
         <cxf.release.base>${basedir}/../..</cxf.release.base>
+        <tomcat.version>8.5.29</tomcat.version>
     </properties>
     <build>
         <plugins>
@@ -44,13 +45,48 @@
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
                 <configuration>
                     <server>myTomcat</server>
                     <url>http://localhost:8080/manager/text</url>
                     <path>/${project.build.finalName}</path>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>1.6.7</version>
+                <configuration>
+                    <container>
+                        <containerId>tomcat8x</containerId>
+                        <artifactInstaller>
+                            <groupId>org.apache.tomcat</groupId>
+                            <artifactId>tomcat</artifactId>
+                            <version>${tomcat.version}</version>
+                        </artifactInstaller>
+                    </container>
+                    <configuration>
+                        <type>standalone</type>
+                        <home>
+                            ${project.build.directory}/apache-tomcat-${tomcat.version}
+                        </home>
+                        <properties>
+                            <cargo.servlet.port>8080</cargo.servlet.port>
+                            <cargo.logging>high</cargo.logging>
+                        </properties>
+                    </configuration>
+                    <deployables>
+                        <deployable>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <type>war</type>
+                            <properties>
+                                <context>/${project.build.finalName}</context>
+                            </properties>
+                        </deployable>
+                    </deployables>
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>java_first_jaxws</finalName>
     </build>

-- 
To stop receiving notification emails like this one, please contact
deki@apache.org.