Author: ebourg
Date: Mon Mar 4 16:52:29 2019
New Revision: 1854777
URL: http://svn.apache.org/viewvc?rev=1854777&view=rev
Log:
Removed the Tomcat 6 plugin
Removed:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/simple-war-project/
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/
Modified:
tomcat/maven-plugin/trunk/README.txt
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt
tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt
tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt.vm
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Modified: tomcat/maven-plugin/trunk/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/README.txt?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/README.txt (original)
+++ tomcat/maven-plugin/trunk/README.txt Mon Mar 4 16:52:29 2019
@@ -48,7 +48,7 @@ To test staging artifacts for a vote pro
* pass staging repository as parameter: -DtcStagedReleaseUrl=
* pass tomcat version as parameter: -Dtomcat7Version=
-Sample for tomcat7 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat7Version=7.x
+Sample for tomcat8 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat8Version=8.x
-Sample for tomcat6 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat6Version=6.x
+Sample for tomcat7 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat7Version=7.x
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Mar 4 16:52:29 2019
@@ -320,7 +320,6 @@
<modules>
<module>common-tomcat-maven-plugin</module>
<module>tomcat-maven-plugin-it</module>
- <module>tomcat6-maven-plugin</module>
<module>tomcat7-war-runner</module>
<module>tomcat7-maven-plugin</module>
<module>tomcat8-war-runner</module>
@@ -898,8 +897,8 @@
</reportSets>
<configuration>
<links>
- <link>http://tomcat.apache.org/tomcat-6.0-doc/api/</link>
<link>http://tomcat.apache.org/tomcat-7.0-doc/api/</link>
+ <link>http://tomcat.apache.org/tomcat-8.0-doc/api/</link>
</links>
<detectLinks>true</detectLinks>
<notimestamp>true</notimestamp>
Modified: tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm Mon Mar 4 16:52:29
2019
@@ -98,7 +98,7 @@ public interface HelloService
** Running the webapp
- From the top directory, you can use: mvn tomcat6:run or mvn tomcat7:run
(depends on tomcat version you want).
+ From the top directory, you can use: mvn tomcat7:run or mvn tomcat8:run
(depends on tomcat version you want).
Now hit your browser http://localhost:9090 and you will use a very
complicated hello world webapp sample
Modified: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt Mon Mar 4
16:52:29 2019
@@ -49,7 +49,7 @@ Container Goals
To list all the currently deployed applications in Tomcat you can type:
+--
-mvn tomcat6:list
+mvn tomcat7/8:list
+--
* {Listing server information}
@@ -58,7 +58,7 @@ mvn tomcat6:list
type:
+--
-mvn tomcat6:info
+mvn tomcat7/8:info
+--
* {Listing JNDI resources}
@@ -66,13 +66,13 @@ mvn tomcat6:info
To list all the JNDI resources available within Tomcat you can type:
+--
-mvn tomcat6:resources
+mvn tomcat7/8:resources
+--
Alternatively, to list only JNDI resources of a specific type you can type:
+--
-mvn -Dmaven.tomcat.type=my.class.name tomcat6:resources
+mvn -Dmaven.tomcat.type=my.class.name tomcat7/8:resources
+--
* {Listing security roles}
@@ -80,5 +80,5 @@ mvn -Dmaven.tomcat.type=my.class.name to
To list the available security roles available within Tomcat you can type:
+--
-mvn tomcat6:roles
+mvn tomcat7/8:roles
+--
Modified: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt Mon Mar 4
16:52:29 2019
@@ -53,25 +53,25 @@ Context Goals
* To redeploy a WAR project deployed by <<<tomcat:deploy>>> you can type:
+--
-mvn package tomcat6/7:redeploy
+mvn package tomcat7/8:redeploy
+--
* To redeploy a WAR project deployed by <<<tomcat:exploded>>> you can type:
+--
-mvn war:exploded tomcat6/7:redeploy
+mvn war:exploded tomcat7/8:redeploy
+--
* To redeploy a WAR project deployed by <<<tomcat:inplace>>> you can type:
+--
-mvn war:inplace tomcat6/7:redeploy
+mvn war:inplace tomcat7/8:redeploy
+--
* To redeploy a context.xml file deployed by <<<tomcat:deploy>>> you can type:
+--
-mvn tomcat6/7:redeploy
+mvn tomcat7/8:redeploy
+--
<<Note:>> Depending on the <<<docBase>>> specified in the <<<context.xml>>>
you
@@ -82,7 +82,7 @@ mvn tomcat6/7:redeploy
To undeploy a WAR from Tomcat you can type:
+--
-mvn tomcat6/7:undeploy
+mvn tomcat7/8:undeploy
+--
* {Starting a WAR project}
@@ -90,7 +90,7 @@ mvn tomcat6/7:undeploy
To start a WAR in Tomcat you can type:
+--
-mvn tomcat6:start
+mvn tomcat7/8:start
+--
* {Stopping a WAR project}
@@ -98,7 +98,7 @@ mvn tomcat6:start
To stop a WAR in Tomcat you can type:
+--
-mvn tomcat6:stop
+mvn tomcat7/8:stop
+--
* {Listing session statistics}
@@ -106,5 +106,5 @@ mvn tomcat6:stop
To list the session statistics for a deployed WAR project you can type:
+--
-mvn tomcat6:sessions
+mvn tomcat7/8:sessions
+--
Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm Mon Mar 4 16:52:29 2019
@@ -56,12 +56,12 @@ Apache Tomcat Maven Plugin
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
+ <artifactId>tomcat8-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
</plugins>
Modified: tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm Mon Mar 4
16:52:29 2019
@@ -34,21 +34,21 @@ Run Mojo: run your Maven war project qui
The run mojo gives you the opportunity to avoid those efforts by simply
running your war inside an embedded Tomcat instance in your Maven build.
<<<NOTE>>> If you have a multi module Maven project and use Maven3, you
don't need to install all modules before using the run goal,
- just use tomcat6/7:run from the root module and the plugin will auto detect
the build output directory from various modules and replace
+ just use tomcat7/8:run from the root module and the plugin will auto detect
the build output directory from various modules and replace
dependencies with those directories in the webapp classloader.
* Running an embedded Tomcat
Configure your pom with the plugin version (for other mojo parameters see
each mojo's documentation).
- And use: mvn tomcat6/7:run
+ And use: mvn tomcat7/8:run
+---------------------
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat8-maven-plugin</artifactId>
+ <!-- or if you want to use tomcat 7.x
<artifactId>tomcat7-maven-plugin</artifactId>
- <!-- or if you want to use tomcat 6.x
- <artifactId>tomcat6-maven-plugin</artifactId>
-->
<version>${project.version}</version>
<configuration>
@@ -99,7 +99,7 @@ Run Mojo: run your Maven war project qui
+---------------------
- With the structure given above, from the top level directory use mvn
tomcat6/7:run -pl :my-webapp -am.
+ With the structure given above, from the top level directory use mvn
tomcat7/8:run -pl :my-webapp -am.
* Use it with selenium mojo
@@ -111,9 +111,9 @@ Run Mojo: run your Maven war project qui
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat8-maven-plugin</artifactId>
+ <!-- or if you want to use tomcat 7.x
<artifactId>tomcat7-maven-plugin</artifactId>
- <!-- or if you want to use tomcat 6.x
- <artifactId>tomcat6-maven-plugin</artifactId>
-->
<version>${project.version}</version>
<executions>
Modified: tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt.vm?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt.vm Mon Mar 4
16:52:29 2019
@@ -28,7 +28,7 @@
Testing SNAPSHOT
- You can test SNAPSHOT versions of the mojos tomcat6 and tomcat7 with the
following configuration.
+ You can test SNAPSHOT versions of the mojos tomcat7 and tomcat8 with the
following configuration.
* Declare the SNAPSHOT pluginRepository or repository if using Apache Maven 2.x
@@ -72,7 +72,7 @@ Testing SNAPSHOT
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<path>/</path>
@@ -80,7 +80,7 @@ Testing SNAPSHOT
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
+ <artifactId>tomcat8-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<path>/</path>
@@ -94,7 +94,7 @@ Testing SNAPSHOT
* Running
- Now you can have fun with tomcat6:run or tomcat7:run
+ Now you can have fun with tomcat7:run or tomcat8:run
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
Mon Mar 4 16:52:29 2019
@@ -34,14 +34,6 @@
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <configuration>
- <port>9090</port>
- <path>/</path>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<configuration>
<port>9090</port>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
Mon Mar 4 16:52:29 2019
@@ -55,11 +55,6 @@
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${tomcatPluginVersion}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>${tomcatPluginVersion}</version>
</plugin>
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Mon Mar 4 16:52:29 2019
@@ -341,8 +341,8 @@ public abstract class AbstractRunMojo
* Tomcat. Instead please configure naming in the <code>server.xml</code>.
* </p>
*
- * @see <a
href="http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/startup/Embedded.html";>org.apache.catalina.startup.Embedded</a>
- * @see <a
href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Tomcat.html";>org.apache.catalina.startup.Tomcat</a>
+ * @see <a
href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Embedded.html";>org.apache.catalina.startup.Embedded</a>
+ * @see <a
href="http://tomcat.apache.org/tomcat-8.0-doc/api/org/apache/catalina/startup/Tomcat.html";>org.apache.catalina.startup.Tomcat</a>
* @since 2.0
*/
@Parameter(property = "maven.tomcat.useNaming", defaultValue = "true")
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java?rev=1854777&r1=1854776&r2=1854777&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Mon Mar 4 16:52:29 2019
@@ -343,8 +343,8 @@ public abstract class AbstractRunMojo
* Tomcat. Instead please configure naming in the <code>server.xml</code>.
* </p>
*
- * @see <a
href="http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/startup/Embedded.html";>org.apache.catalina.startup.Embedded</a>
- * @see <a
href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Tomcat.html";>org.apache.catalina.startup.Tomcat</a>
+ * @see <a
href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Embedded.html";>org.apache.catalina.startup.Embedded</a>
+ * @see <a
href="http://tomcat.apache.org/tomcat-8.0-doc/api/org/apache/catalina/startup/Tomcat.html";>org.apache.catalina.startup.Tomcat</a>
* @since 2.0
*/
@Parameter( property = "maven.tomcat.useNaming", defaultValue = "true" )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
