Author: olamy
Date: Thu Sep 15 22:19:42 2011
New Revision: 1171296
URL: http://svn.apache.org/viewvc?rev=1171296&view=rev
Log:
[MTOMCAT-97] rename current tomcat maven plugin to tomcat6 and add tomcat7 :
fix artifactId and project name, fix other pom samples
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/usage.apt.vm
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Sep 15 22:19:42 2011
@@ -32,7 +32,7 @@
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin-parent</artifactId>
<packaging>pom</packaging>
- <name>Tomcat Maven Plugin Project</name>
+ <name>Tomcat Maven Plugin</name>
<version>2.0-SNAPSHOT</version>
<description>The Tomcat Maven Plugin provides goals to manipulate WAR
projects within the Tomcat servlet
container.
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml
Thu Sep 15 22:19:42 2011
@@ -39,8 +39,8 @@
<version>2.1-alpha-2</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
</plugins>
@@ -54,8 +54,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<executions>
<execution>
<id>tomcat-run</id>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml
Thu Sep 15 22:19:42 2011
@@ -39,8 +39,8 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
</plugins>
@@ -54,8 +54,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<executions>
<execution>
<id>tomcat-run</id>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml
Thu Sep 15 22:19:42 2011
@@ -36,8 +36,8 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
</plugins>
@@ -45,8 +45,8 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<executions>
<execution>
<id>tomcat-run</id>
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Thu Sep 15 22:19:42
2011
@@ -27,11 +27,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Tomcat Maven Plugin</name>
- <description>The Tomcat Maven Plugin provides goals to manipulate WAR
projects within the Tomcat servlet
- container.
+ <name>Tomcat Maven Plugin :: Tomcat 6.x</name>
+ <description>The Tomcat Maven Plugin provides goals to manipulate WAR
projects within the Tomcat 6.x servlet container.
</description>
<prerequisites>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
Thu Sep 15 22:19:42 2011
@@ -40,7 +40,7 @@ Adding System Properties
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<systemProperties>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
Thu Sep 15 22:19:42 2011
@@ -44,7 +44,7 @@ Adjust Tomcat Version
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<dependencies>
<dependency>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
Thu Sep 15 22:19:42 2011
@@ -54,7 +54,7 @@ Tomcat 7 and Maven 2 plugin
+----------------------------------------------+
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
+----------------------------------------------+
@@ -112,7 +112,7 @@ Tomcat 7 and Maven 2 plugin
+----------------------------------------------+
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<url>http://localhost:8080/manager/html</url>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm
Thu Sep 15 22:19:42 2011
@@ -72,7 +72,7 @@ mvn tomcat:deploy
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<warFile>path/to/my/warFile.war</warFile>
@@ -126,7 +126,7 @@ mvn war:exploded tomcat:exploded
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<warDirectory>path/to/my/warDir</warDirectory>
@@ -157,7 +157,7 @@ mvn war:exploded tomcat:exploded
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<mode>both</mode>
@@ -188,7 +188,7 @@ mvn war:exploded tomcat:exploded
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<contextFile>path/to/my/contextFile.xml</contextFile>
@@ -228,7 +228,7 @@ mvn war:inplace tomcat:inplace
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<warSourceDirectory>path/to/my/warSourceDir</warSourceDirectory>
@@ -256,7 +256,7 @@ mvn war:inplace tomcat:inplace
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<mode>both</mode>
@@ -285,7 +285,7 @@ mvn war:inplace tomcat:inplace
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<contextFile>path/to/my/contextFile.xml</contextFile>
@@ -317,7 +317,7 @@ mvn war:inplace tomcat:inplace
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<mode>context</mode>
@@ -356,7 +356,7 @@ mvn tomcat:deploy
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<contextFile>path/to/my/contextFile.xml</contextFile>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/usage.apt.vm?rev=1171296&r1=1171295&r2=1171296&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/usage.apt.vm
(original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/usage.apt.vm
Thu Sep 15 22:19:42 2011
@@ -56,7 +56,7 @@ Usage
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<url>http://www.mydomain.com:1234/mymanager</url>
@@ -88,7 +88,7 @@ Usage
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<server>myserver</server>
@@ -139,7 +139,7 @@ Usage
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<path>/mycontext</path>
@@ -168,7 +168,7 @@ Usage
...
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<path>/\${project.build.finalName}</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
