Removed the Tomcat 6 plugin
git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1854777 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README.txt b/README.txt
index b75679e..f82a695 100644
--- a/README.txt
+++ b/README.txt
@@ -48,7 +48,7 @@
* 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
diff --git a/pom.xml b/pom.xml
index 3bcf3ce..166f5b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/site/apt/archetype.apt.vm b/src/site/apt/archetype.apt.vm
index 89ff1f9..6e50643 100644
--- a/src/site/apt/archetype.apt.vm
+++ b/src/site/apt/archetype.apt.vm
@@ -98,7 +98,7 @@
** 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
diff --git a/src/site/apt/container-goals.apt b/src/site/apt/container-goals.apt
index d0b4d34..32dafa9 100644
--- a/src/site/apt/container-goals.apt
+++ b/src/site/apt/container-goals.apt
@@ -49,7 +49,7 @@
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 @@
type:
+--
-mvn tomcat6:info
+mvn tomcat7/8:info
+--
* {Listing JNDI resources}
@@ -66,13 +66,13 @@
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 @@
To list the available security roles available within Tomcat you can type:
+--
-mvn tomcat6:roles
+mvn tomcat7/8:roles
+--
diff --git a/src/site/apt/context-goals.apt b/src/site/apt/context-goals.apt
index c2803d6..eeb4f1c 100644
--- a/src/site/apt/context-goals.apt
+++ b/src/site/apt/context-goals.apt
@@ -53,25 +53,25 @@
* 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 @@
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 @@
To start a WAR in Tomcat you can type:
+--
-mvn tomcat6:start
+mvn tomcat7/8:start
+--
* {Stopping a WAR project}
@@ -98,7 +98,7 @@
To stop a WAR in Tomcat you can type:
+--
-mvn tomcat6:stop
+mvn tomcat7/8:stop
+--
* {Listing session statistics}
@@ -106,5 +106,5 @@
To list the session statistics for a deployed WAR project you can type:
+--
-mvn tomcat6:sessions
+mvn tomcat7/8:sessions
+--
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 0cca369..0172361 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -56,12 +56,12 @@
<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>
diff --git a/src/site/apt/run-mojo-features.apt.vm b/src/site/apt/run-mojo-features.apt.vm
index bf232da..f63d2ed 100644
--- a/src/site/apt/run-mojo-features.apt.vm
+++ b/src/site/apt/run-mojo-features.apt.vm
@@ -34,21 +34,21 @@
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 @@
+---------------------
- 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 @@
<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>
diff --git a/src/site/apt/snapshot-test.apt.vm b/src/site/apt/snapshot-test.apt.vm
index d9b49a1..9f4ec3e 100644
--- a/src/site/apt/snapshot-test.apt.vm
+++ b/src/site/apt/snapshot-test.apt.vm
@@ -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 @@
...
<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 @@
</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 @@
* Running
- Now you can have fun with tomcat6:run or tomcat7:run
+ Now you can have fun with tomcat7:run or tomcat8:run
diff --git a/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml b/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
index 8d039e6..db0b00b 100644
--- a/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
+++ b/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
@@ -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>
diff --git a/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml b/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
index 2adbd3a..9ae412c 100644
--- a/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -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>
diff --git a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml b/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml
deleted file mode 100644
index cd8df68..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.codehaus.mojo.tomcat.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <properties>
- <pluginVersion>${project.version}</pluginVersion>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <path>/</path>
- <systemProperties>
- <com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/tomcatconf/empty.txt b/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/tomcatconf/empty.txt
deleted file mode 100644
index 11925e4..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/tomcatconf/empty.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file
diff --git a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/tomcatconf/server.xml b/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/tomcatconf/server.xml
deleted file mode 100644
index 76ab562..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/tomcatconf/server.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<Server port="8010" shutdown="SHUTDOWN">
-
- <GlobalNamingResources>
- <!-- Used by Manager webapp -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <Service name="Catalina">
- <Connector port="8080" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
- <Connector port="8088" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
- <Engine name="Catalina" defaultHost="localhost">
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false" pattern="%t-ip:%a-protocol:%H-localPort:%p-path:%U-time:%D ms"/>
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase" />
- <Host name="localhost" appBase="webapps" />
- </Engine>
-
- </Service>
-</Server>
diff --git a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/webapp/index.jsp b/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/webapp/index.jsp
deleted file mode 100644
index 2197216..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-It works !!
\ No newline at end of file
diff --git a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/webapp/web.xml b/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/webapp/web.xml
deleted file mode 100644
index 7cddd47..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/main/webapp/web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-
-</web-app>
\ No newline at end of file
diff --git a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/test/java/WaitIT.java b/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/test/java/WaitIT.java
deleted file mode 100644
index 4c020c6..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/simple-war-project/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml b/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml
deleted file mode 100644
index cc3abe2..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.codehaus.mojo.tomcat.it</groupId>
- <artifactId>tomcat-run-multi-config</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <properties>
- <!-- Set to false if you want to debug the tomcat -->
- <maven.tomcat.fork>true</maven.tomcat.fork>
- <pluginVersion>${project.version}</pluginVersion>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <additionalConfigFilesDir>\${basedir}/src/main/tcconf</additionalConfigFilesDir>
- <configurationDir>\${project.build.directory}/tc</configurationDir>
- <path>/multi-config</path>
- <port>8001</port>
- <uriEncoding>UTF-8</uriEncoding>
- <systemProperties>
- <com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt b/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
deleted file mode 100644
index 11925e4..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file
diff --git a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/webapp/index.jsp b/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
deleted file mode 100644
index 6fa84f6..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Example</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body>
-<p>
-<c:choose>
- <c:when test="${empty param.string}">
- Not set.
- </c:when>
- <c:otherwise>
- String: <b><c:out value="${param.string}" /></b>!
- </c:otherwise>
-</c:choose>
-</p>
-</body>
-</html>
-
-
-
diff --git a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/webapp/web.xml b/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/webapp/web.xml
deleted file mode 100644
index 96c7790..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/main/webapp/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-<jsp-config>
- <taglib>
- <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
- <taglib-location>/WEB-INF/tld/c.tld</taglib-location>
- </taglib>
-</jsp-config>
- <!--
- <taglib>
- <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
- <taglib-location>/WEB-INF/c.tld</taglib-location>
- </taglib>
--->
-
-</web-app>
diff --git a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/test/java/WaitIT.java b/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
deleted file mode 100644
index 4c020c6..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/pom.xml b/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/pom.xml
deleted file mode 100644
index 152fa0d..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.codehaus.mojo.tomcat.it</groupId>
- <artifactId>usage-contextpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <properties>
- <pluginVersion>${project.version}</pluginVersion>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <path>/lorem</path>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/src/main/webapp/index.html b/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/src/main/webapp/index.html
deleted file mode 100644
index 8562c81..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/src/main/webapp/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <title>Usage-Example: Contextpath</title>
-</head>
-<body>
-Success!
-</body>
-</html>
diff --git a/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/src/test/java/WaitIT.java b/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/src/test/java/WaitIT.java
deleted file mode 100644
index 209b7d7..0000000
--- a/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,31 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat6-maven-plugin/pom.xml b/tomcat6-maven-plugin/pom.xml
deleted file mode 100644
index 2b84d41..0000000
--- a/tomcat6-maven-plugin/pom.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Apache 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>
-
- <properties>
- <tomcat6Version>6.0.43</tomcat6Version>
- <managerWebAppPath>${basedir}/target/</managerWebAppPath>
- <warTestPath>${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war</warTestPath>
- <keystoreTestPath>${basedir}/src/test/keystore</keystoreTestPath>
- </properties>
- <prerequisites>
- <maven>${mavenVersion}</maven>
- </prerequisites>
- <inceptionYear>2005</inceptionYear>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>common-tomcat-maven-plugin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-classworlds</artifactId>
- </dependency>
-
- <!-- tomcat dependencies -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>${tomcat6Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina-ha</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tribes</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
- <artifactId>ecj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>dbcp</artifactId>
- <version>${tomcat6Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <exclusions>
- <exclusion>
- <groupId>nekohtml</groupId>
- <artifactId>xercesMinimal</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin-it</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/**IT*</exclude>
- </excludes>
- <systemPropertyVariables>
- <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <unzip src="src/test/manager.war" dest="${managerWebAppPath}" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
- <profiles>
- <profile>
- <id>run-its</id>
-
- <build>
- <plugins>
- <plugin>
- <!-- For integration tests the plugin needs to be installed before
- the integration tests are executed -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
- <execution>
- <id>install-plugin-pre-integration-test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <mojoVersion>${project.version}</mojoVersion>
- <verifier.maven.debug>${verifier.maven.debug}</verifier.maven.debug>
- <verifier.debugJvm>${verifier.debugJvm}</verifier.debugJvm>
- <its.http.port>${its.http.port}</its.http.port>
- <its.https.port>${its.https.port}</its.https.port>
- <its.ajp.port>${its.ajp.port}</its.ajp.port>
- <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
deleted file mode 100644
index 2439932..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.settings.Proxy;
-import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.tomcat.maven.common.deployer.TomcatManager;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.StringTokenizer;
-
-/**
- * Abstract goal that provides common configuration for Catalina-based goals.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-public abstract class AbstractCatalinaMojo
- extends AbstractI18NTomcat6Mojo
-{
- // ----------------------------------------------------------------------
- // Constants
- // ----------------------------------------------------------------------
-
- /**
- * The name of this Maven plugin. Used to produce the user agent when communicating with Tomcat manager.
- */
- private String name = "Apache Tomcat Maven Plugin";
-
- /**
- * The default username to use when authenticating with Tomcat manager.
- */
- private static final String DEFAULT_USERNAME = "admin";
-
- /**
- * The default password to use when authenticating with Tomcat manager.
- */
- private static final String DEFAULT_PASSWORD = "";
-
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The Maven Wagon manager to use when obtaining server authentication details.
- */
- @Component( role = WagonManager.class )
- private WagonManager wagonManager;
-
- /**
- * The current build session instance. This is used for plugin manager API calls.
- */
- @Component
- private MavenSession session;
-
- /**
- * The full URL of the Tomcat manager instance to use.
- */
- @Parameter( property = "maven.tomcat.url", defaultValue = "http://localhost:8080/manager", required = true )
- private URL url;
-
- /**
- * The server id in settings.xml to use when authenticating with Tomcat manager, or <code>null</code> to use
- * defaults of username <code>admin</code> and no password.
- */
- @Parameter( property = "maven.tomcat.server" )
- private String server;
-
- /**
- * The URL encoding charset to use when communicating with Tomcat manager.
- */
- @Parameter( property = "maven.tomcat.charset", defaultValue = "ISO-8859-1", required = true )
- private String charset;
-
- /**
- * The tomcat username to use for deployment
- *
- * @since 1.0-alpha-2
- */
- @Parameter( property = "tomcat.username" )
- private String username;
-
- /**
- * The password to use for deployment
- *
- * @since 1.0-alpha-2
- */
- @Parameter( property = "tomcat.password" )
- private String password;
-
- @Parameter( property = "plugin.version", required = true, readonly = true )
- private String version;
-
- /**
- * Skip the execution.
- *
- * @since 2.3
- */
- @Parameter( property = "maven.tomcat.skip", defaultValue = "false" )
- private boolean skip;
-
- // ----------------------------------------------------------------------
- // Fields
- // ----------------------------------------------------------------------
-
- /**
- * The Tomcat manager wrapper object.
- */
- private TomcatManager manager;
-
- // ----------------------------------------------------------------------
- // Mojo Implementation
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- public void execute()
- throws MojoExecutionException
- {
- if ( this.skip )
- {
- getLog().info( "skip execution" );
- return;
- }
-
- try
- {
- invokeManager();
- }
- catch ( TomcatManagerException exception )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "AbstractCatalinaMojo.managerError", exception.getMessage() ) );
- }
- catch ( IOException exception )
- {
- throw new MojoExecutionException( messagesProvider.getMessage( "AbstractCatalinaMojo.managerIOError" ),
- exception );
- }
- }
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * Invokes Tomcat manager when this Mojo is executed.
- *
- * @throws MojoExecutionException if there was a problem executing this goal
- * @throws TomcatManagerException if the Tomcat manager request fails
- * @throws IOException if an i/o error occurs
- */
- protected abstract void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException;
-
- /**
- * Gets the Tomcat manager wrapper object configured for this goal.
- *
- * @return the Tomcat manager wrapper object
- * @throws MojoExecutionException if there was a problem obtaining the authentication details
- */
- protected TomcatManager getManager()
- throws MojoExecutionException
- {
- // lazily instantiate when config values have been injected
- if ( manager == null )
- {
- String userName;
- String password;
-
- if ( server == null )
- {
- // no server set, use defaults
- getLog().debug( messagesProvider.getMessage( "AbstractCatalinaMojo.defaultAuth" ) );
- userName = DEFAULT_USERNAME;
- password = DEFAULT_PASSWORD;
- }
- else
- {
- // obtain authenication details for specified server from wagon
- AuthenticationInfo info = wagonManager.getAuthenticationInfo( server );
- if ( info == null )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "AbstractCatalinaMojo.unknownServer", server ) );
- }
-
- // derive username
- userName = info.getUserName();
- if ( userName == null )
- {
- getLog().debug( messagesProvider.getMessage( "AbstractCatalinaMojo.defaultUserName" ) );
- userName = DEFAULT_USERNAME;
- }
-
- // derive password
- password = info.getPassword();
- if ( password == null )
- {
- getLog().debug( messagesProvider.getMessage( "AbstractCatalinaMojo.defaultPassword" ) );
- password = DEFAULT_PASSWORD;
- }
- }
-
- // if userName/password are defined in the mojo or the cli they override
- if ( !StringUtils.isEmpty( this.username ) )
- {
- userName = this.username;
- password = this.password == null ? "" : this.password;
- //getLog( ).debug( "user user/password " + userName + "/" + password );
- }
-
- manager = new TomcatManager( url, userName, password, charset, settings.isInteractiveMode() );
- manager.setUserAgent( name + "/" + version );
-
- Proxy proxy = session.getSettings().getActiveProxy();
- if ( proxy != null && proxy.isActive() )
- {
- getLog().debug( "proxy: " + proxy.getHost() + ":" + proxy.getPort() );
- manager.setProxy( proxy );
- }
- }
-
- return manager;
- }
-
- /**
- * Gets the full URL of the Tomcat manager instance.
- *
- * @return the full URL of the Tomcat manager instance to use
- */
- protected URL getURL()
- {
- return url;
- }
-
- /**
- * Gets the webapp context path to use when communicating with Tomcat manager.
- *
- * @return the webapp context path to use
- */
- protected String getPath()
- {
- return path;
- }
-
- /**
- * Gets the URL of the deployed webapp.
- *
- * @return the URL of the deployed webapp
- * @throws MalformedURLException if the deployed webapp URL is invalid
- */
- protected URL getDeployedURL()
- throws MalformedURLException
- {
- return new URL( getURL(), getPath() );
- }
-
- /**
- * Splits the given string into lines and writes each one separately to the log at info level.
- *
- * @param string the string to write
- */
- protected void log( String string )
- {
- StringTokenizer tokenizer = new StringTokenizer( string, "\n\r" );
-
- while ( tokenizer.hasMoreTokens() )
- {
- getLog().info( tokenizer.nextToken() );
- }
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
deleted file mode 100644
index 459727e..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * Deploy a WAR to Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-public abstract class AbstractDeployMojo
- extends AbstractWarCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The deployment mode to use. This must be either <code>war</code> to deploy the war, <code>context</code> to
- * deploy the context XML file, or <code>both</code> to deploy the war with the context XML file.
- */
- @Parameter( property = "maven.tomcat.mode", defaultValue = "war", required = true )
- private String mode;
-
- /**
- * The path of the Tomcat context XML file. This is not used for war deployment mode.
- */
- @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}/META-INF/context.xml" )
- private File contextFile;
-
- /**
- * Whether Tomcat should automatically undeploy webapps that already exist when deploying.
- */
- @Parameter( property = "maven.tomcat.update", defaultValue = "false", required = true )
- private boolean update;
-
- /**
- * The Tomcat webapp tag name to use.
- */
- @Parameter( property = "maven.tomcat.tag" )
- private String tag;
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- if ( "war".equals( mode ) )
- {
- deployWar();
- }
- else if ( "context".equals( mode ) )
- {
- deployContext();
- }
- else if ( "both".equals( mode ) )
- {
- deployWarAndContext();
- }
- else
- {
- throw new MojoExecutionException( messagesProvider.getMessage( "AbstractDeployMojo.unknownMode", mode ) );
- }
- }
-
- /**
- * Gets the Tomcat WAR file. This may be a file or a directory depending on the deployment mode.
- *
- * @return the Tomcat WAR file.
- */
- protected abstract File getWarFile();
-
- /**
- * Ensures that the Tomcat WAR file exists and is the correct type for the deployment mode.
- *
- * @throws MojoExecutionException if the WAR file does not exist or is not the correct type for the deployment mode
- */
- protected abstract void validateWarFile()
- throws MojoExecutionException;
-
- /**
- * Gets the Tomcat context XML file.
- *
- * @return the Tomcat context XML file.
- */
- protected File getContextFile()
- {
- return contextFile;
- }
-
- /**
- * Ensures that the Tomcat context XML file exists and is indeed a file.
- *
- * @throws MojoExecutionException if the context file does not exist or is not a file
- */
- protected void validateContextFile()
- throws MojoExecutionException
- {
- if ( !contextFile.exists() || !contextFile.isFile() )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "AbstractDeployMojo.missingContext", contextFile.getPath() ) );
- }
- }
-
- /**
- * Gets whether Tomcat should automatically undeploy webapps that already exist when deploying.
- *
- * @return whether Tomcat should automatically undeploy webapps that already exist when deploying
- */
- protected boolean isUpdate()
- {
- return update;
- }
-
- /**
- * Gets the Tomcat webapp tag name to use.
- *
- * @return the Tomcat webapp tag name to use
- */
- protected String getTag()
- {
- return tag;
- }
-
- /**
- * Deploys the WAR to Tomcat.
- *
- * @throws MojoExecutionException if there was a problem locating the WAR
- * @throws TomcatManagerException if the Tomcat manager request fails
- * @throws IOException if an i/o error occurs
- */
- protected void deployWar()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- validateWarFile();
-
- getLog().info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL() ) );
-
- URL warURL = getWarFile().toURL();
-
- TomcatManagerResponse tomcatResponse = getManager().deploy( getPath(), warURL, isUpdate(), getTag() );
-
- checkTomcatResponse( tomcatResponse );
- }
-
- /**
- * Deploys the context XML file to Tomcat.
- *
- * @throws MojoExecutionException if there was a problem locating the context XML file
- * @throws TomcatManagerException if the Tomcat manager request fails
- * @throws IOException if an i/o error occurs
- */
- protected void deployContext()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- validateContextFile();
-
- getLog().info( messagesProvider.getMessage( "AbstractDeployMojo.deployingContext", getDeployedURL() ) );
-
- URL contextURL = getContextFile().toURL();
-
- TomcatManagerResponse tomcatResponse =
- getManager().deployContext( getPath(), contextURL, isUpdate(), getTag() );
-
- checkTomcatResponse( tomcatResponse );
- }
-
- /**
- * Deploys the WAR and context XML file to Tomcat.
- *
- * @throws MojoExecutionException if there was a problem locating either the WAR or the context XML file
- * @throws TomcatManagerException if the Tomcat manager request fails
- * @throws IOException if an i/o error occurs
- */
- protected void deployWarAndContext()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- validateWarFile();
- validateContextFile();
-
- getLog().info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWarContext", getDeployedURL() ) );
-
- URL warURL = getWarFile().toURL();
- URL contextURL = getContextFile().toURL();
-
- TomcatManagerResponse tomcatResponse =
- getManager().deployContext( getPath(), contextURL, warURL, isUpdate(), getTag() );
-
- checkTomcatResponse( tomcatResponse );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
deleted file mode 100644
index 79967ef..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author olamy
- * @since 1.0-alpha-2
- */
-public class AbstractDeployWarMojo
- extends AbstractDeployMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The path of the WAR file to deploy.
- */
- @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}.war", property = "maven.tomcat.warFile", required = true )
- private File warFile;
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getWarFile()
- {
- return warFile;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void validateWarFile()
- throws MojoExecutionException
- {
- if ( !warFile.exists() || !warFile.isFile() )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "DeployMojo.missingWar", warFile.getPath() ) );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void deployWar()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- validateWarFile();
-
- getLog().info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL() ) );
-
- TomcatManagerResponse tomcatResponse =
- getManager().deploy( getPath(), warFile, isUpdate(), getTag(), warFile.length() );
-
- checkTomcatResponse( tomcatResponse );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java
deleted file mode 100644
index f53eb16..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.settings.Settings;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-import org.apache.tomcat.maven.common.messages.MessagesProvider;
-
-/**
- * olamy: as long as maven plugin descriptor metadata generation doesn't support annotations outside of the same
- * project, we must have those fields here
- *
- * @author Olivier Lamy
- */
-public abstract class AbstractI18NTomcat6Mojo
- extends AbstractMojo
-{
-
- @Component
- protected Settings settings;
-
- @Component(role = MessagesProvider.class)
- protected MessagesProvider messagesProvider;
-
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The webapp context path to use for the web application being run. This must always start with a forward-slash
- * ('/').
- */
- @Parameter(property = "maven.tomcat.path", defaultValue = "/${project.artifactId}", required = true)
- protected String path;
-
-
- protected String getPath()
- {
- return path;
- }
-
- /**
- * Check response of Tomcat to know if ok or not.
- *
- * @param tomcatResponse response of tomcat return by TomcatManager class
- * @throws MojoExecutionException if HTTP status code greater than 400 (included)
- */
- protected void checkTomcatResponse( TomcatManagerResponse tomcatResponse )
- throws MojoExecutionException
- {
- int statusCode = tomcatResponse.getStatusCode();
-
- if ( statusCode >= 400 )
- {
- getLog().error( messagesProvider.getMessage( "tomcatHttpStatusError", statusCode,
- tomcatResponse.getReasonPhrase() ) );
-
- throw new MojoExecutionException(
- messagesProvider.getMessage( "tomcatHttpStatusError", statusCode,
- tomcatResponse.getReasonPhrase() ) + ": "
- + tomcatResponse.getHttpResponseBody() );
- }
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
deleted file mode 100644
index 4047934..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
+++ /dev/null
@@ -1,1285 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.catalina.Context;
-import org.apache.catalina.Engine;
-import org.apache.catalina.Host;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.connector.Connector;
-import org.apache.catalina.loader.WebappLoader;
-import org.apache.catalina.realm.MemoryRealm;
-import org.apache.catalina.servlets.DefaultServlet;
-import org.apache.catalina.startup.Catalina;
-import org.apache.catalina.startup.Embedded;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.filtering.MavenFileFilter;
-import org.apache.maven.shared.filtering.MavenFileFilterRequest;
-import org.apache.maven.shared.filtering.MavenFilteringException;
-import org.apache.tomcat.maven.common.config.AbstractWebapp;
-import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Abstract goal that provides common configuration for embedded Tomcat goals.
- *
- * @author Jurgen Lust
- * @author Mark Hobson <markhobson@gmail.com>
- */
-public abstract class AbstractRunMojo
- extends AbstractI18NTomcat6Mojo
-{
- // ---------------------------------------------------------------------
- // Mojo Components
- // ---------------------------------------------------------------------
-
- /**
- * Used to look up Artifacts in the remote repository.
- */
- @Component(role = ArtifactFactory.class)
- protected ArtifactFactory artifactFactory;
-
- /**
- * Location of the local repository.
- */
- @Parameter(defaultValue = "${localRepository}", required = true, readonly = true)
- private ArtifactRepository artifactRepository;
-
- /**
- * Used to look up Artifacts in the remote repository.
- */
- @Component(role = ArtifactResolver.class)
- protected ArtifactResolver artifactResolver;
-
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The packaging of the Maven project that this goal operates upon.
- */
- @Parameter(defaultValue = "${project.packaging}", required = true, readonly = true)
- private String packaging;
-
- /**
- * The directory to create the Tomcat server configuration under.
- */
- @Parameter(defaultValue = "${project.build.directory}/tomcat")
- private File configurationDir;
-
- /**
- * The port to run the Tomcat server on.
- */
- @Parameter(property = "maven.tomcat.port", defaultValue = "8080")
- private int port;
-
- /**
- * this IP address will be used on all ports.
- *
- * @since 2.2
- */
- @Parameter(property = "maven.tomcat.address")
- private String address;
-
- /**
- * The AJP port to run the Tomcat server on.
- * By default it's 0 this means won't be started.
- * The ajp connector will be started only for value > 0.
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.ajp.port", defaultValue = "0")
- private int ajpPort;
-
- /**
- * The AJP protocol to run the Tomcat server on.
- * By default it's ajp.
- * NOTE The ajp connector will be started only if {@link #ajpPort} > 0.
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.ajp.protocol", defaultValue = "ajp")
- private String ajpProtocol;
-
- /**
- * The https port to run the Tomcat server on.
- * By default it's 0 this means won't be started.
- * The https connector will be started only for value > 0.
- *
- * @since 1.0
- */
- @Parameter(property = "maven.tomcat.httpsPort", defaultValue = "0")
- private int httpsPort;
-
- /**
- * The max post size to run the Tomcat server on.
- * By default it's 2097152 bytes. That's the default Tomcat configuration.
- * Set this value to 0 or less to disable the post size limit.
- *
- * @since 2.3
- */
- @Parameter(property = "maven.tomcat.maxPostSize", defaultValue = "2097152")
- private int maxPostSize;
-
- /**
- * The character encoding to use for decoding URIs.
- *
- * @since 1.0
- */
- @Parameter(property = "maven.tomcat.uriEncoding", defaultValue = "ISO-8859-1")
- private String uriEncoding;
-
- /**
- * List of System properties to pass to the Tomcat Server.
- *
- * @since 1.0-alpha-2
- */
- @Parameter
- private Map<String, String> systemProperties;
-
- /**
- * The directory contains additional configuration Files that copied in the Tomcat conf Directory.
- *
- * @since 1.0-alpha-2
- */
- @Parameter(property = "maven.tomcat.additionalConfigFilesDir", defaultValue = "${basedir}/src/main/tomcatconf")
- private File additionalConfigFilesDir;
-
- /**
- * server.xml to use <b>Note if you use this you must configure in this file your webapp paths</b>.
- *
- * @since 1.0-alpha-2
- */
- @Parameter(property = "maven.tomcat.serverXml")
- private File serverXml;
-
- /**
- * overriding the providing web.xml to run tomcat
- * <b>This override the global Tomcat web.xml located in $CATALINA_HOME/conf/</b>
- *
- * @since 1.0-alpha-2
- */
- @Parameter(property = "maven.tomcat.webXml")
- private File tomcatWebXml;
-
- /**
- * Set this to true to allow Maven to continue to execute after invoking
- * the run goal.
- *
- * @since 1.0
- */
- @Parameter(property = "maven.tomcat.fork", defaultValue = "false")
- private boolean fork;
-
- /**
- * Will create a tomcat context for each dependencies of war type with 'scope' set to 'tomcat'.
- * In other words, dependencies with:
- * <pre>
- * <type>war</type>
- * <scope>tomcat</scope>
- * </pre>
- * To preserve backward compatibility it's false by default.
- *
- * @since 1.0
- * @deprecated use webapps instead
- */
- @Parameter(property = "maven.tomcat.addContextWarDependencies", defaultValue = "false")
- private boolean addContextWarDependencies;
-
- /**
- * The maven project.
- *
- * @since 1.0
- */
- @Component
- protected MavenProject project;
-
- /**
- * The archive manager.
- *
- * @since 1.0
- */
- @Component(role = ArchiverManager.class)
- private ArchiverManager archiverManager;
-
- /**
- * if <code>true</code> a new classLoader separated from maven core will be created to start tomcat.
- *
- * @since 1.0
- */
- @Parameter(property = "tomcat.useSeparateTomcatClassLoader", defaultValue = "false")
- protected boolean useSeparateTomcatClassLoader;
-
- /**
- * @since 1.0
- */
- @Parameter(defaultValue = "${plugin.artifacts}", required = true)
- private List<Artifact> pluginArtifacts;
-
- /**
- * If set to true ignore if packaging of project is not 'war'.
- *
- * @since 1.0
- */
- @Parameter(property = "tomcat.ignorePackaging", defaultValue = "false")
- private boolean ignorePackaging;
-
- /**
- * enable client authentication for https (if configured)
- * see <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/http.html#SSL_Support">http://tomcat.apache.org/tomcat-6.0-doc/config/http.html#SSL_Support</a>
- *
- * @since 2.3
- */
- @Parameter(property = "maven.tomcat.https.clientAuth", defaultValue = "false")
- private String clientAuth;
-
- /**
- * Override the default keystoreFile for the HTTPS connector (if enabled)
- *
- * @since 1.1
- */
- @Parameter
- private String keystoreFile;
-
- /**
- * Override the default keystorePass for the HTTPS connector (if enabled)
- *
- * @since 1.1
- */
- @Parameter
- private String keystorePass;
-
- /**
- * Override the type of keystore file to be used for the server certificate. If not specified, the default value is "JKS".
- *
- * @since 2.0
- */
- @Parameter(defaultValue = "JKS")
- private String keystoreType;
-
- /**
- * Override the default truststoreFile for the HTTPS connector (if enabled)
- *
- * @since 2.2
- */
- @Parameter
- private String truststoreFile;
-
- /**
- * Override the default truststorePass for the HTTPS connector (if enabled)
- *
- * @since 2.2
- */
- @Parameter
- private String truststorePass;
-
- /**
- * Override the default truststoreType for the HTTPS connector (if enabled)
- *
- * @since 2.2
- */
- @Parameter
- private String truststoreType;
-
- /**
- * Override the default truststoreProvider for the HTTPS connector (if enabled)
- *
- * @since 2.2
- */
- @Parameter
- private String truststoreProvider;
-
- /**
- * <p>
- * Enables or disables naming support for the embedded Tomcat server. By default the embedded Tomcat
- * in Tomcat 6 comes with naming enabled. In contrast to this the embedded Tomcat 7 comes with
- * naming disabled by default.
- * </p>
- * <p>
- * <strong>Note:</strong> This setting is ignored if you provide a <code>server.xml</code> for your
- * 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>
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.useNaming", defaultValue = "true")
- private boolean useNaming;
-
- /**
- * Force context scanning if you don't use a context file with reloadable = "true".
- * The other way to use contextReloadable is to add attribute reloadable = "true"
- * in your context file.
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.contextReloadable", defaultValue = "false")
- protected boolean contextReloadable;
-
- /**
- * represents the delay in seconds between each classPathScanning change invocation
- *
- * @see <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/context.html">http://tomcat.apache.org/tomcat-6.0-doc/config/context.html</a>
- */
- @Parameter(property = "maven.tomcat.backgroundProcessorDelay", defaultValue = "-1")
- protected int backgroundProcessorDelay = -1;
-
- /**
- * The path of the Tomcat context XML file.
- */
- @Parameter(defaultValue = "src/main/webapp/META-INF/context.xml")
- protected File contextFile;
-
- /**
- * The protocol to run the Tomcat server on.
- * By default it's HTTP/1.1.
- * See possible values <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/http.html">HTTP Connector</a>
- * protocol attribute
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.protocol", defaultValue = "HTTP/1.1")
- private String protocol;
-
- /**
- * The path of the Tomcat users XML file.
- */
- @Parameter(property = "maven.tomcat.tomcatUsers.file")
- private File tomcatUsers;
-
- /**
- * to install a manager in your embeded tomcat
- *
- * @since 2.0
- */
- @Parameter
- private File managerWarPath;
-
-
- /**
- * Skip execution
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.skip", defaultValue = "false")
- protected boolean skip;
-
- /**
- * @see {@link Webapp}
- * @since 2.0
- */
- @Parameter
- private List<Webapp> webapps;
-
- /**
- * configure host name
- *
- * @since 2.1
- */
- @Parameter(property = "maven.tomcat.hostName", defaultValue = "localhost")
- protected String hostName;
-
- /**
- * configure aliases
- * see <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/host.html#Host_Name_Aliases">Host Name aliases</a>
- *
- * @since 2.1
- */
- @Parameter
- protected String[] aliases;
-
- // ----------------------------------------------------------------------
- // Fields
- // ----------------------------------------------------------------------
-
- /**
- * @since 1.0
- */
- private ClassRealm tomcatRealm;
-
- /**
- * The static context
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.staticContextPath", defaultValue = "/")
- private String staticContextPath;
-
- /**
- * The static context docroot base fully qualified path.
- * if <code>null</code> static context won't be added
- *
- * @since 2.0
- */
- @Parameter(property = "maven.tomcat.staticContextDocbase")
- private String staticContextDocbase;
-
- /**
- * Class loader class to set.
- *
- * @since 2.0
- */
- @Parameter
- protected String classLoaderClass;
-
- /**
- * @since 2.2
- */
- @Parameter(property = "maven.tomcat.useBodyEncodingForURI", defaultValue = "false")
- protected boolean useBodyEncodingForURI;
-
- @Parameter(defaultValue = "${session}", readonly = true, required = true)
- protected MavenSession session;
-
- @Component(role = MavenFileFilter.class, hint = "default")
- protected MavenFileFilter mavenFileFilter;
-
- // ----------------------------------------------------------------------
- // Mojo Implementation
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- if ( skip )
- {
- getLog().info( "skip execution" );
- return;
- }
- // ensure project is a web application and we have at least additionnal webapps to run
- if ( !isWar() && !addContextWarDependencies && getAdditionalWebapps().isEmpty() )
- {
- getLog().info( messagesProvider.getMessage( "AbstractRunMojo.nonWar" ) );
- return;
- }
- ClassLoader originalClassLoader = null;
- try
- {
-
- if ( useSeparateTomcatClassLoader )
- {
- originalClassLoader = Thread.currentThread().getContextClassLoader();
- }
- getLog().info( messagesProvider.getMessage( "AbstractRunMojo.runningWar", getWebappUrl() ) );
-
- initConfiguration();
- startContainer();
- if ( !fork )
- {
- waitIndefinitely();
- }
- }
- catch ( LifecycleException exception )
- {
- throw new MojoExecutionException( messagesProvider.getMessage( "AbstractRunMojo.cannotStart" ), exception );
- }
- catch ( IOException exception )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "AbstractRunMojo.cannotCreateConfiguration" ), exception );
- }
- catch ( MavenFilteringException e )
- {
- throw new MojoExecutionException( "filtering issue: " + e.getMessage(), e );
- }
- finally
- {
- if ( useSeparateTomcatClassLoader )
- {
- Thread.currentThread().setContextClassLoader( originalClassLoader );
- }
- }
- }
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * Gets the webapp context path to use for the web application being run.
- *
- * @return the webapp context path
- */
- protected String getPath()
- {
- return path;
- }
-
- /**
- * Gets the context to run this web application under for the specified embedded Tomcat.
- *
- * @param container the embedded Tomcat container being used
- * @return the context to run this web application under
- * @throws IOException if the context could not be created
- * @throws MojoExecutionException in case of an error creating the context
- */
- protected Context createContext( Embedded container )
- throws IOException, MojoExecutionException
- {
- String contextPath = getPath();
- Context context =
- container.createContext( "/".equals( contextPath ) ? "" : contextPath, getDocBase().getAbsolutePath() );
-
- if ( useSeparateTomcatClassLoader )
- {
- context.setParentClassLoader( getTomcatClassLoader() );
- }
-
- final WebappLoader webappLoader = createWebappLoader();
-
- if ( classLoaderClass != null )
- {
- webappLoader.setLoaderClass( classLoaderClass );
- }
-
- context.setLoader( webappLoader );
- File contextFile = getContextFile();
- if ( contextFile != null )
- {
- context.setConfigFile( getContextFile().getAbsolutePath() );
- }
- return context;
- }
-
- /**
- * Gets the webapp loader to run this web application under.
- *
- * @return the webapp loader to use
- * @throws IOException if the webapp loader could not be created
- * @throws MojoExecutionException in case of an error creating the webapp loader
- */
- protected WebappLoader createWebappLoader()
- throws IOException, MojoExecutionException
- {
- if ( useSeparateTomcatClassLoader )
- {
- return ( isContextReloadable() )
- ? new ExternalRepositoriesReloadableWebappLoader( getTomcatClassLoader(), getLog() )
- : new WebappLoader( getTomcatClassLoader() );
- }
-
- return ( isContextReloadable() )
- ? new ExternalRepositoriesReloadableWebappLoader( Thread.currentThread().getContextClassLoader(), getLog() )
- : new WebappLoader( Thread.currentThread().getContextClassLoader() );
- }
-
- /**
- * Determine whether the passed context.xml file declares the context as reloadable or not.
- *
- * @return false by default, true if reloadable="true" in context.xml.
- */
- protected boolean isContextReloadable()
- throws MojoExecutionException
- {
- if ( contextReloadable || backgroundProcessorDelay > 0 )
- {
- return true;
- }
- // determine whether to use a reloadable Loader or not (default is false).
- boolean reloadable = false;
- try
- {
- if ( contextFile != null && contextFile.exists() )
- {
- DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = builderFactory.newDocumentBuilder();
- Document contextDoc = builder.parse( contextFile );
- contextDoc.getDocumentElement().normalize();
-
- NamedNodeMap nodeMap = contextDoc.getDocumentElement().getAttributes();
- Node reloadableAttribute = nodeMap.getNamedItem( "reloadable" );
-
- reloadable =
- ( reloadableAttribute != null ) ? Boolean.valueOf( reloadableAttribute.getNodeValue() ) : false;
- }
- getLog().debug( "context reloadable: " + reloadable );
- }
- catch ( IOException ioe )
- {
- getLog().error( "Could not parse file: [" + contextFile.getAbsolutePath() + "]", ioe );
- }
- catch ( ParserConfigurationException pce )
- {
- getLog().error( "Could not configure XML parser", pce );
- }
- catch ( SAXException se )
- {
- getLog().error( "Could not parse file: [" + contextFile.getAbsolutePath() + "]", se );
- }
-
- return reloadable;
- }
-
-
- /**
- * Gets the webapp directory to run.
- *
- * @return the webapp directory
- */
- protected abstract File getDocBase();
-
- /**
- * Gets the Tomcat context XML file to use.
- *
- * @return the context XML file
- */
- protected abstract File getContextFile()
- throws MojoExecutionException;
-
- // ----------------------------------------------------------------------
- // Private Methods
- // ----------------------------------------------------------------------
-
- /**
- * Gets whether this project uses WAR packaging.
- *
- * @return whether this project uses WAR packaging
- */
- protected boolean isWar()
- {
- return "war".equals( packaging ) || ignorePackaging;
- }
-
- /**
- * Gets the URL of the running webapp.
- *
- * @return the URL of the running webapp
- * @throws MalformedURLException if the running webapp URL is invalid
- */
- private URL getWebappUrl()
- throws MalformedURLException
- {
- return new URL( "http", "localhost", port, getPath() );
- }
-
- /**
- * Creates the Tomcat configuration directory with the necessary resources.
- *
- * @throws IOException if the Tomcat configuration could not be created
- * @throws MojoExecutionException if the Tomcat configuration could not be created
- */
- private void initConfiguration()
- throws IOException, MojoExecutionException, MavenFilteringException
- {
- if ( configurationDir.exists() )
- {
- getLog().info( messagesProvider.getMessage( "AbstractRunMojo.usingConfiguration", configurationDir ) );
- }
- else
- {
- getLog().info( messagesProvider.getMessage( "AbstractRunMojo.creatingConfiguration", configurationDir ) );
-
- configurationDir.mkdirs();
-
- File confDir = new File( configurationDir, "conf" );
- confDir.mkdir();
-
- copyFile( "/conf/tomcat-users.xml", new File( confDir, "tomcat-users.xml" ) );
-
- if ( tomcatWebXml != null )
- {
- if ( !tomcatWebXml.exists() )
- {
- throw new MojoExecutionException( " tomcatWebXml " + tomcatWebXml.getPath() + " not exists" );
- }
- //MTOMCAT-42 here it's a real file resources not a one coming with the mojo
- FileUtils.copyFile( tomcatWebXml, new File( confDir, "web.xml" ) );
- //MTOMCAT-128 apply filtering
- MavenFileFilterRequest mavenFileFilterRequest = new MavenFileFilterRequest();
- mavenFileFilterRequest.setFrom( tomcatWebXml );
- mavenFileFilterRequest.setTo( new File( confDir, "web.xml" ) );
- mavenFileFilterRequest.setMavenProject( project );
- mavenFileFilterRequest.setMavenSession( session );
- mavenFileFilterRequest.setFiltering( true );
-
- mavenFileFilter.copyFile( mavenFileFilterRequest );
- }
- else
- {
- copyFile( "/conf/web.xml", new File( confDir, "web.xml" ) );
- }
-
- File logDir = new File( configurationDir, "logs" );
- logDir.mkdir();
-
- File webappsDir = new File( configurationDir, "webapps" );
- webappsDir.mkdir();
- if ( managerWarPath != null && managerWarPath.exists() )
- {
- FileUtils.copyFileToDirectory( managerWarPath, webappsDir );
- }
-
- if ( additionalConfigFilesDir != null && additionalConfigFilesDir.exists() )
- {
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.addDefaultExcludes();
- scanner.setBasedir( additionalConfigFilesDir.getPath() );
- scanner.scan();
-
- String[] files = scanner.getIncludedFiles();
-
- if ( files != null && files.length > 0 )
- {
- getLog().info( "Coping additional tomcat config files" );
-
- for ( int i = 0; i < files.length; i++ )
- {
- File file = new File( additionalConfigFilesDir, files[i] );
-
- getLog().info( " copy " + file.getName() );
-
- FileUtils.copyFileToDirectory( file, confDir );
- }
- }
- }
- }
- }
-
- /**
- * Copies the specified class resource to the specified file.
- *
- * @param fromPath the path of the class resource to copy
- * @param toFile the file to copy to
- * @throws IOException if the file could not be copied
- */
- private void copyFile( String fromPath, File toFile )
- throws IOException
- {
- URL fromURL = getClass().getResource( fromPath );
-
- if ( fromURL == null )
- {
- throw new FileNotFoundException( fromPath );
- }
-
- FileUtils.copyURLToFile( fromURL, toFile );
- }
-
- /**
- * Starts the embedded Tomcat server.
- *
- * @throws IOException if the server could not be configured
- * @throws LifecycleException if the server could not be started
- * @throws MojoExecutionException if the server could not be configured
- */
- private void startContainer()
- throws IOException, LifecycleException, MojoExecutionException
- {
- String previousCatalinaBase = System.getProperty( "catalina.base" );
-
- try
- {
-
- // Set the system properties
- setupSystemProperties();
-
- System.setProperty( "catalina.base", configurationDir.getAbsolutePath() );
- System.setProperty( "catalina.home", configurationDir.getAbsolutePath() );
-
- File catalinaPolicy = new File( configurationDir, "conf/catalina.policy" );
-
- if ( catalinaPolicy.exists() )
- {
- // FIXME restore previous value ?
- System.setProperty( "java.security.policy", catalinaPolicy.getAbsolutePath() );
- }
-
- final Embedded container;
- if ( serverXml != null )
- {
- if ( !serverXml.exists() )
- {
- throw new MojoExecutionException( serverXml.getPath() + " not exists" );
- }
-
- container = new Catalina();
- container.setCatalinaHome( configurationDir.getAbsolutePath() );
- container.setCatalinaBase( configurationDir.getAbsolutePath() );
- ( (Catalina) container ).setConfigFile( serverXml.getPath() );
- ( (Catalina) container ).setRedirectStreams( true );
- ( (Catalina) container ).setUseNaming( this.useNaming );
-
- container.start();
- }
- else
- {
- // create server
- container = new Embedded();
- container.setCatalinaHome( configurationDir.getAbsolutePath() );
- MemoryRealm memoryRealm = new MemoryRealm();
-
- if ( tomcatUsers != null )
- {
- if ( !tomcatUsers.exists() )
- {
- throw new MojoExecutionException( " tomcatUsers " + tomcatUsers.getPath() + " not exists" );
- }
- getLog().info( "use tomcat-users.xml from " + tomcatUsers.getAbsolutePath() );
- memoryRealm.setPathname( tomcatUsers.getAbsolutePath() );
-
- }
-
- container.setRealm( memoryRealm );
- container.setUseNaming( useNaming );
-
- //container.createLoader( getTomcatClassLoader() ).
-
- // create context
- Context context = createContext( container );
-
- // create host
- String appBase = new File( configurationDir, "webapps" ).getAbsolutePath();
- Host host = container.createHost( "localHost", appBase );
-
- if ( hostName != null )
- {
- host.setName( hostName );
- }
- if ( aliases != null )
- {
- for ( String alias : aliases )
- {
- host.addAlias( alias );
- }
- }
-
- host.addChild( context );
- createStaticContext( container, context, host );
- if ( addContextWarDependencies || !getAdditionalWebapps().isEmpty() )
- {
- Collection<Context> dependencyContexts = createDependencyContexts( container );
- for ( Context extraContext : dependencyContexts )
- {
- host.addChild( extraContext );
- }
- }
-
- // create engine
- Engine engine = container.createEngine();
- engine.setName( "localEngine-" + port );
- engine.addChild( host );
- engine.setDefaultHost( host.getName() );
- container.addEngine( engine );
-
- getLog().debug( "start tomcat instance on http port:" + port + " and protocol: " + protocol );
-
- // create http connector
- Connector httpConnector = container.createConnector( (InetAddress) null, port, protocol );
- httpConnector.setMaxPostSize( maxPostSize );
- if ( httpsPort > 0 )
- {
- httpConnector.setRedirectPort( httpsPort );
- }
- httpConnector.setURIEncoding( uriEncoding );
- httpConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI );
-
- if ( address != null )
- {
- httpConnector.setAttribute( "address", address );
- }
-
- container.addConnector( httpConnector );
-
- // create https connector
- if ( httpsPort > 0 )
- {
- Connector httpsConnector = container.createConnector( (InetAddress) null, httpsPort, true );
- httpsConnector.setSecure( true );
- httpsConnector.setMaxPostSize( maxPostSize );
- httpsConnector.setProperty( "SSLEnabled", "true" );
- // should be default but configure it anyway
- httpsConnector.setProperty( "sslProtocol", "TLS" );
- if ( keystoreFile != null )
- {
- httpsConnector.setAttribute( "keystoreFile", keystoreFile );
- }
- if ( keystorePass != null )
- {
- httpsConnector.setAttribute( "keystorePass", keystorePass );
- }
- if ( keystoreType != null )
- {
- httpsConnector.setAttribute( "keystoreType", keystoreType );
- }
-
- if ( truststoreFile != null )
- {
- httpsConnector.setAttribute( "truststoreFile", truststoreFile );
- }
-
- if ( truststorePass != null )
- {
- httpsConnector.setAttribute( "truststorePass", truststorePass );
- }
-
- if ( truststoreType != null )
- {
- httpsConnector.setAttribute( "truststoreType", truststoreType );
- }
-
- if ( truststoreProvider != null )
- {
- httpsConnector.setAttribute( "truststoreProvider", truststoreProvider );
- }
-
- httpsConnector.setAttribute("clientAuth", clientAuth);
- httpsConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI );
-
- if ( address != null )
- {
- httpsConnector.setAttribute( "address", address );
- }
-
- container.addConnector( httpsConnector );
-
- }
-
- // create ajp connector
- if ( ajpPort > 0 )
- {
- Connector ajpConnector = container.createConnector( (InetAddress) null, ajpPort, ajpProtocol );
- ajpConnector.setURIEncoding( uriEncoding );
- ajpConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI );
- if ( address != null )
- {
- ajpConnector.setAttribute( "address", address );
- }
- container.addConnector( ajpConnector );
- }
- if ( useSeparateTomcatClassLoader )
- {
- Thread.currentThread().setContextClassLoader( getTomcatClassLoader() );
- engine.setParentClassLoader( getTomcatClassLoader() );
- }
- container.start();
- }
-
- EmbeddedRegistry.getInstance().register( container );
- }
- finally
- {
- if ( previousCatalinaBase != null )
- {
- System.setProperty( "catalina.base", previousCatalinaBase );
- }
- }
- }
-
- private List<Webapp> getAdditionalWebapps()
- {
- if ( webapps == null )
- {
- return Collections.emptyList();
- }
- return webapps;
- }
-
- protected ClassRealm getTomcatClassLoader()
- throws MojoExecutionException
- {
- if ( this.tomcatRealm != null )
- {
- return tomcatRealm;
- }
- try
- {
- ClassWorld world = new ClassWorld();
- ClassRealm root = world.newRealm( "tomcat", Thread.currentThread().getContextClassLoader() );
-
- for ( Artifact pluginArtifact : pluginArtifacts )
- {
- // add all plugin artifacts see https://issues.apache.org/jira/browse/MTOMCAT-122
- if ( pluginArtifact.getFile() != null )
- {
- root.addURL( pluginArtifact.getFile().toURI().toURL() );
- }
-
- }
- tomcatRealm = root;
- return root;
- }
- catch ( DuplicateRealmException e )
- {
- throw new MojoExecutionException( e.getMessage(), e );
- }
- catch ( MalformedURLException e )
- {
- throw new MojoExecutionException( e.getMessage(), e );
- }
- }
-
- @SuppressWarnings("unchecked")
- public Set<Artifact> getProjectArtifacts()
- {
- return project.getArtifacts();
- }
-
- /**
- * Causes the current thread to wait indefinitely. This method does not return.
- */
- private void waitIndefinitely()
- {
- Object lock = new Object();
-
- synchronized ( lock )
- {
- try
- {
- lock.wait();
- }
- catch ( InterruptedException exception )
- {
- getLog().warn( messagesProvider.getMessage( "AbstractRunMojo.interrupted" ), exception );
- }
- }
- }
-
-
- /**
- * Set the SystemProperties from the configuration.
- */
- private void setupSystemProperties()
- {
- if ( systemProperties != null && !systemProperties.isEmpty() )
- {
- getLog().info( "setting SystemProperties:" );
-
- for ( String key : systemProperties.keySet() )
- {
- String value = systemProperties.get( key );
-
- if ( value != null )
- {
- getLog().info( " " + key + "=" + value );
- System.setProperty( key, value );
- }
- else
- {
- getLog().info( "skip sysProps " + key + " with empty value" );
- }
- }
- }
- }
-
-
- /**
- * Allows the startup of additional webapps in the tomcat container by declaration with scope
- * "tomcat".
- *
- * @param container tomcat
- * @return dependency tomcat contexts of warfiles in scope "tomcat" and those from webapps
- */
- private Collection<Context> createDependencyContexts( Embedded container )
- throws MojoExecutionException
- {
- getLog().info( "Deploying dependency wars" );
- // Let's add other modules
- List<Context> contexts = new ArrayList<Context>();
-
- ScopeArtifactFilter filter = new ScopeArtifactFilter( "tomcat" );
- @SuppressWarnings("unchecked") Set<Artifact> artifacts = project.getArtifacts();
- for ( Artifact artifact : artifacts )
- {
- // Artifact is not yet registered and it has neither test, nor a
- // provided scope, not is it optional
- if ( "war".equals( artifact.getType() ) && !artifact.isOptional() && filter.include( artifact ) )
- {
- addContextFromArtifact( container, contexts, artifact, "/" + artifact.getArtifactId(), null );
- }
- }
-
- for ( AbstractWebapp additionalWebapp : getAdditionalWebapps() )
- {
- String contextPath = additionalWebapp.getContextPath();
- if ( !contextPath.startsWith( "/" ) )
- {
- contextPath = "/" + contextPath;
- }
- addContextFromArtifact( container, contexts, getArtifact( additionalWebapp ), contextPath,
- additionalWebapp.getContextFile() );
- }
- return contexts;
- }
-
-
- private void addContextFromArtifact( Embedded container, List<Context> contexts, Artifact artifact,
- String contextPath, File contextXml )
- throws MojoExecutionException
- {
- getLog().info( "Deploy warfile: " + String.valueOf( artifact.getFile() ) + " to contextPath: " + contextPath );
- File webapps = new File( configurationDir, "webapps" );
- File artifactWarDir = new File( webapps, artifact.getArtifactId() );
- if ( !artifactWarDir.exists() )
- {
- //dont extract if exists
- artifactWarDir.mkdir();
- try
- {
- UnArchiver unArchiver = archiverManager.getUnArchiver( "zip" );
- unArchiver.setSourceFile( artifact.getFile() );
- unArchiver.setDestDirectory( artifactWarDir );
-
- // Extract the module
- unArchiver.extract();
- }
- catch ( NoSuchArchiverException e )
- {
- getLog().error( e );
- return;
- }
- catch ( ArchiverException e )
- {
- getLog().error( e );
- return;
- }
- }
- WebappLoader webappLoader = new WebappLoader( Thread.currentThread().getContextClassLoader() );
- Context context = container.createContext( contextPath, artifactWarDir.getAbsolutePath() );
- context.setLoader( webappLoader );
-
- File contextFile = contextXml != null ? contextXml : getContextFile();
- if ( contextFile != null )
- {
- context.setConfigFile( contextFile.getAbsolutePath() );
- }
- contexts.add( context );
- }
-
-
- private void createStaticContext( final Embedded container, Context context, Host host )
- {
- if ( staticContextDocbase != null )
- {
- Context staticContext = container.createContext( staticContextPath, staticContextDocbase );
- staticContext.setPrivileged( true );
- Wrapper servlet = context.createWrapper();
- servlet.setServletClass( DefaultServlet.class.getName() );
- servlet.setName( "staticContent" );
- staticContext.addChild( servlet );
- staticContext.addServletMapping( "/", "staticContent" );
- host.addChild( staticContext );
- }
- }
-
-
- /**
- * Resolves the Artifact from the remote repository if necessary. If no version is specified, it will be retrieved
- * from the dependency list or from the DependencyManagement section of the pom.
- *
- * @param additionalWebapp containing information about artifact from plugin configuration.
- * @return Artifact object representing the specified file.
- * @throws MojoExecutionException with a message if the version can't be found in DependencyManagement.
- */
- protected Artifact getArtifact( AbstractWebapp additionalWebapp )
- throws MojoExecutionException
- {
-
- Artifact artifact;
- VersionRange vr;
- try
- {
- vr = VersionRange.createFromVersionSpec( additionalWebapp.getVersion() );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- getLog().warn( "fail to create versionRange from version: " + additionalWebapp.getVersion(), e );
- vr = VersionRange.createFromVersion( additionalWebapp.getVersion() );
- }
-
- if ( StringUtils.isEmpty( additionalWebapp.getClassifier() ) )
- {
- artifact = artifactFactory.createDependencyArtifact( additionalWebapp.getGroupId(),
- additionalWebapp.getArtifactId(), vr,
- additionalWebapp.getType(), null,
- Artifact.SCOPE_COMPILE );
- }
- else
- {
- artifact = artifactFactory.createDependencyArtifact( additionalWebapp.getGroupId(),
- additionalWebapp.getArtifactId(), vr,
- additionalWebapp.getType(),
- additionalWebapp.getClassifier(),
- Artifact.SCOPE_COMPILE );
- }
-
- try
- {
- artifactResolver.resolve( artifact, project.getRemoteArtifactRepositories(), this.artifactRepository );
- }
- catch ( ArtifactResolutionException e )
- {
- throw new MojoExecutionException( "Unable to resolve artifact.", e );
- }
- catch ( ArtifactNotFoundException e )
- {
- throw new MojoExecutionException( "Unable to find artifact.", e );
- }
-
- return artifact;
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java
deleted file mode 100644
index e353b60..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Parameter;
-
-import java.io.File;
-
-/**
- * Runs the current project as a packaged web application using an embedded Tomcat server.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- * @todo depend on war:exploded when MNG-1649 resolved
- */
-public abstract class AbstractRunWarMojo
- extends AbstractRunMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The path of the exploded WAR directory to run.
- */
- @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}", required = true )
- private File warDirectory;
-
- /**
- * The path of the Tomcat context XML file.
- */
- @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}/META-INF/context.xml" )
- private File contextFile;
-
- // ----------------------------------------------------------------------
- // AbstractRunMojo Implementation
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getDocBase()
- {
- return warDirectory;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getContextFile()
- {
- return contextFile;
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java
deleted file mode 100644
index 44e8506..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Parameter;
-
-/**
- * Abstract goal that provides common configuration for Catalina-based goals.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-public abstract class AbstractWarCatalinaMojo
- extends AbstractCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The packaging of the Maven project that this goal operates upon.
- */
- @Parameter( defaultValue = "${project.packaging}", required = true, readonly = true )
- private String packaging;
-
- /**
- * If set to true ignore if packaging of project is not 'war'.
- *
- * @since 1.1
- */
- @Parameter( property = "tomcat.ignorePackaging", defaultValue = "false" )
- private boolean ignorePackaging;
-
- // ----------------------------------------------------------------------
- // Mojo Implementation
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void execute()
- throws MojoExecutionException
- {
- if ( !isWar() )
- {
- getLog().info( messagesProvider.getMessage( "AbstractWarCatalinaMojo.nonWar" ) );
- return;
- }
-
- super.execute();
- }
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * Gets whether this project uses WAR packaging.
- *
- * @return whether this project uses WAR packaging
- */
- protected boolean isWar()
- {
- return "war".equals( packaging ) || ignorePackaging;
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java
deleted file mode 100644
index 7f1414c..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Deploy a WAR to Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "deploy", threadSafe = true )
-@Execute( phase = LifecyclePhase.PACKAGE )
-public class DeployMojo
- extends AbstractDeployWarMojo
-{
- // no-op : only mojo metadata overriding
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java
deleted file mode 100644
index 3734d1b..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Deploy a WAR to Tomcat without forking the package lifecycle.
- *
- * @author olamy
- * @since 1.0-alpha-2
- */
-@Mojo( name = "deploy-only", threadSafe = true )
-public class DeployOnlyMojo
- extends AbstractDeployWarMojo
-{
- // no-op : only mojo metadata overriding
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java
deleted file mode 100644
index 577a497..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-import java.io.File;
-
-/**
- * Deploy an exploded WAR to Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- * @todo depend on war:exploded when MNG-1649 resolved
- */
-@Mojo( name = "exploded", threadSafe = true )
-public class ExplodedMojo
- extends AbstractDeployMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The path of the exploded WAR directory to deploy.
- */
- @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}", required = true )
- private File warDirectory;
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getWarFile()
- {
- return warDirectory;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void validateWarFile()
- throws MojoExecutionException
- {
- if ( !warDirectory.exists() || !warDirectory.isDirectory() )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "ExplodedMojo.missingWar", warDirectory.getPath() ) );
- }
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExternalRepositoriesReloadableWebappLoader.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExternalRepositoriesReloadableWebappLoader.java
deleted file mode 100644
index b223cdb..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExternalRepositoriesReloadableWebappLoader.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.catalina.loader.WebappLoader;
-import org.apache.maven.plugin.logging.Log;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A {@linkplain WebappLoader} implementation that allows scanning for changes to project classpath in support of
- * context reloads.
- *
- * @author Ryan Connolly
- * @since 2.0
- */
-public class ExternalRepositoriesReloadableWebappLoader
- extends WebappLoader
-{
-
- /**
- * Last modification times of all jar and class files.
- */
- private Map<String, Long> modificationTimeMap = new HashMap<String, Long>();
-
- private Log log;
-
- /**
- * Default Constructor.
- */
- public ExternalRepositoriesReloadableWebappLoader()
- {
- super();
- }
-
-
- /**
- * Convenience Constructor allows setting of a parent ClassLoader.
- *
- * @param parent the ClassLoader instance to set as this Loader's parent ClassLoader.
- */
- public ExternalRepositoriesReloadableWebappLoader( ClassLoader parent, Log log )
- {
- super( parent );
- this.log = log;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addRepository( String repository )
- {
- super.addRepository( repository );
- try
- {
- File file = new File( new URL( repository ).getPath().replaceAll( "%20", " " ) );
- if ( file.isDirectory() )
- {
- addClassDirectory( file );
- }
- else if ( file.isFile() && file.getName().endsWith( ".jar" ) )
- {
- addFile( file );
- }
- }
- catch ( MalformedURLException muex )
- {
- throw new RuntimeException( muex );
- }
- }
-
- /**
- * Tracks modification times of files in the given class directory.
- *
- * @param directory the File directory to track modification times for.
- */
- private void addClassDirectory( File directory )
- {
- for ( File file : directory.listFiles() )
- {
- if ( file.isDirectory() )
- {
- //remember also directory last modification time
- addFile( file );
- addClassDirectory( file );
- }
- else if ( file.isFile() )
- {
- addFile( file );
- }
- }
- }
-
- /**
- * Tracks last modification time of the given File.
- *
- * @param file the File for which to track last modification time.
- */
- private void addFile( File file )
- {
- modificationTimeMap.put( file.getAbsolutePath(), file.lastModified() );
- }
-
- /**
- * Check if {@link WebappLoader} says modified(), if not then check files from added repositories.
- */
- @Override
- public boolean modified()
- {
- boolean modified = super.modified();
- if ( !modified )
- {
- if ( log != null )
- {
- log.debug( "classPath scanning started at " + new Date().toString() );
- }
- for ( Map.Entry<String, Long> entry : modificationTimeMap.entrySet() )
- {
- String key = entry.getKey();
- File file = new File( key );
- if ( file.exists() )
- {
- // file could be deleted.
- Long savedLastModified = modificationTimeMap.get( key );
- if ( file.lastModified() > savedLastModified )
- {
- modified = true;
- modificationTimeMap.put( key, file.lastModified() );
-
- // directory last modification time can change when some class,
- // jar or subdirectory was added or deleted.
- if ( file.isDirectory() )
- {
- addClassDirectory( file );
- }
- }
- }
- }
- }
- if ( log != null )
- {
- log.debug( "context " + modified + " at " + new Date().toString() );
- }
- return modified;
- }
-
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java
deleted file mode 100644
index 1270d70..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-import java.io.File;
-
-/**
- * Deploy a WAR in-place to Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- * @todo depend on war:inplace when MNG-1649 resolved
- */
-@Mojo( name = "inplace", threadSafe = true )
-public class InplaceMojo
- extends AbstractDeployMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The path of the inplace WAR directory to deploy.
- */
- @Parameter( defaultValue = "${basedir}/src/main/webapp", required = true )
- private File warSourceDirectory;
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getWarFile()
- {
- return warSourceDirectory;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void validateWarFile()
- throws MojoExecutionException
- {
- if ( !warSourceDirectory.exists() || !warSourceDirectory.isDirectory() )
- {
- throw new MojoExecutionException(
- messagesProvider.getMessage( "InplaceMojo.missingWar", warSourceDirectory.getPath() ) );
- }
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java
deleted file mode 100644
index 33cd24a..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Lists all the currently deployed web applications in Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "list", threadSafe = true )
-public class ListMojo
- extends AbstractCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "ListMojo.listApps", getURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().list();
-
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
deleted file mode 100644
index cefdbef..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Redeploy a WAR in Tomcat. (Alias for the deploy goal with its update parameter set to true.)
- *
- * @author Mark Hobson <markhobson@gmail.com>
- * @todo depend on war:war, war:exploded or war:inplace when MNG-1649 resolved
- */
-@Mojo( name = "redeploy", threadSafe = true )
-@Execute( phase = LifecyclePhase.PACKAGE )
-public class RedeployMojo
- extends DeployMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean isUpdate()
- {
- return true;
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
deleted file mode 100644
index 559d977..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Redeploy a WAR in Tomcat without forking the package lifecycle.
- * (Alias for the deploy-only goal with its update parameter set to true.)
- *
- * @since 2.1
- */
-@Mojo( name = "redeploy-only", threadSafe = true )
-public class RedeployOnlyMojo
- extends DeployOnlyMojo
-{
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean isUpdate()
- {
- return true;
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java
deleted file mode 100644
index 13afecf..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Reload a WAR in Tomcat.
- *
- * @author olamy
- */
-@Mojo( name = "reload", threadSafe = true )
-public class ReloadMojo
- extends AbstractWarCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "ReloadMojo.reloadingApp", getDeployedURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().reload( getPath() );
-
- /* TODO : Tomcat always return http status 200. How check message to know error or not,
- * cause is can be in french, english....
- */
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
deleted file mode 100644
index 12dda87..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Lists JNDI resources in Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "resources", threadSafe = true )
-public class ResourcesMojo
- extends AbstractCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * The class name of the resources to list, or <code>null</code> for all.
- *
- * @parameter expression = "${maven.tomcat.type}"
- */
- private String type;
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- if ( type == null )
- {
- getLog().info( messagesProvider.getMessage( "ResourcesMojo.listAllResources", getURL() ) );
- }
- else
- {
- getLog().info( messagesProvider.getMessage( "ResourcesMojo.listTypedResources", type, getURL() ) );
- }
-
- TomcatManagerResponse tomcatResponse = getManager().getResources( type );
-
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
deleted file mode 100644
index 5a8757e..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Lists security roles in Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "roles", threadSafe = true )
-public class RolesMojo
- extends AbstractCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "RolesMojo.listRoles", getURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().getRoles() ;
-
- /* TODO : Tomcat always return http status 200. How check message to know error or not,
- * cause is can be in french, english....
- */
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
deleted file mode 100644
index 1ff0136..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.catalina.Context;
-import org.apache.catalina.loader.WebappLoader;
-import org.apache.catalina.startup.Embedded;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.tomcat.maven.common.run.ClassLoaderEntriesCalculator;
-import org.apache.tomcat.maven.common.run.ClassLoaderEntriesCalculatorRequest;
-import org.apache.tomcat.maven.common.run.ClassLoaderEntriesCalculatorResult;
-import org.apache.tomcat.maven.common.run.TomcatRunException;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.Xpp3DomWriter;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Runs the current project as a dynamic web application using an embedded Tomcat server.
- *
- * @author Jurgen Lust
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "run", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
-@Execute( phase = LifecyclePhase.PROCESS_CLASSES )
-public class RunMojo
- extends AbstractRunMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
-
- /**
- * The set of dependencies for the web application being run.
- */
- @Parameter( defaultValue = "${project.artifacts}", required = true, readonly = true )
- private Set<Artifact> dependencies;
-
- /**
- * The web resources directory for the web application being run.
- */
- @Parameter( defaultValue = "${basedir}/src/main/webapp", property = "tomcat.warSourceDirectory" )
- private File warSourceDirectory;
-
-
- /**
- * Set the "follow standard delegation model" flag used to configure our ClassLoader.
- *
- * @see http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/loader/WebappLoader.html#setDelegate(boolean)
- * @since 1.0
- */
- @Parameter( property = "tomcat.delegate", defaultValue = "true" )
- private boolean delegate = true;
-
- /**
- * @since 2.0
- */
- @Component( role = ClassLoaderEntriesCalculator.class )
- private ClassLoaderEntriesCalculator classLoaderEntriesCalculator;
-
- /**
- * will add /WEB-INF/lib/*.jar and /WEB-INF/classes from war dependencies in the webappclassloader
- *
- * @since 2.0
- */
- @Parameter( property = "maven.tomcat.addWarDependenciesInClassloader", defaultValue = "true" )
- private boolean addWarDependenciesInClassloader;
-
- /**
- * will use the test classpath rather than the compile one and will add test dependencies too
- *
- * @since 2.0
- */
- @Parameter( property = "maven.tomcat.useTestClasspath", defaultValue = "false" )
- private boolean useTestClasspath;
-
- /**
- * Additional optional directories to add to the embedded tomcat classpath.
- *
- * @since 2.0-beta-1
- */
- @Parameter( alias = "additionalClassesDirs" )
- private List<String> additionalClasspathDirs;
-
- // ----------------------------------------------------------------------
- // AbstractRunMojo Implementation
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- *
- * @throws MojoExecutionException
- */
- @Override
- protected Context createContext( Embedded container )
- throws IOException, MojoExecutionException
- {
- Context context = super.createContext( container );
-
- context.setReloadable( isContextReloadable() );
-
- return context;
- }
-
- /**
- * {@inheritDoc}
- *
- * @throws MojoExecutionException
- */
- @Override
- protected WebappLoader createWebappLoader()
- throws IOException, MojoExecutionException
- {
- WebappLoader loader = super.createWebappLoader();
- if ( useSeparateTomcatClassLoader )
- {
- loader.setDelegate( delegate );
- }
-
- try
- {
- ClassLoaderEntriesCalculatorRequest request =
- new ClassLoaderEntriesCalculatorRequest().setDependencies( dependencies ).setLog(
- getLog() ).setMavenProject( project ).setAddWarDependenciesInClassloader(
- addWarDependenciesInClassloader ).setUseTestClassPath( useTestClasspath );
- ClassLoaderEntriesCalculatorResult classLoaderEntriesCalculatorResult =
- classLoaderEntriesCalculator.calculateClassPathEntries( request );
- List<String> classLoaderEntries = classLoaderEntriesCalculatorResult.getClassPathEntries();
- final List<File> tmpDirectories = classLoaderEntriesCalculatorResult.getTmpDirectories();
-
- Runtime.getRuntime().addShutdownHook( new Thread()
- {
- @Override
- public void run()
- {
- for ( File tmpDir : tmpDirectories )
- {
- try
- {
- FileUtils.deleteDirectory( tmpDir );
- }
- catch ( IOException e )
- {
- // ignore
- }
- }
- }
- } );
-
- if ( classLoaderEntries != null )
- {
- for ( String classLoaderEntry : classLoaderEntries )
- {
- loader.addRepository( classLoaderEntry );
- }
- }
- if ( additionalClasspathDirs != null && !additionalClasspathDirs.isEmpty() )
- {
- for ( String additionalClasspathDir : additionalClasspathDirs )
- {
- if ( StringUtils.isNotBlank( additionalClasspathDir ) )
- {
- File file = new File( additionalClasspathDir );
- if ( file.exists() )
- {
- String fileUri = file.toURI().toString();
- getLog().debug( "add file:" + fileUri + " as a additionalClasspathDir" );
- loader.addRepository( fileUri );
- }
- }
- }
- }
- }
- catch ( TomcatRunException e )
- {
- throw new MojoExecutionException( e.getMessage(), e );
- }
-
- return loader;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getDocBase()
- {
- return warSourceDirectory;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected File getContextFile()
- throws MojoExecutionException
- {
- File temporaryContextFile = null;
-
- //----------------------------------------------------------------------------
- // context attributes backgroundProcessorDelay reloadable cannot be modified at runtime.
- // It looks only values from the file ared used
- // so here we create a temporary file with values modified
- //----------------------------------------------------------------------------
- FileReader fr = null;
- FileWriter fw = null;
- StringWriter sw = new StringWriter();
- try
- {
- temporaryContextFile = File.createTempFile( "tomcat-maven-plugin", "temp-ctx-file" );
- temporaryContextFile.deleteOnExit();
- fw = new FileWriter( temporaryContextFile );
- // format to modify/create <Context backgroundProcessorDelay="5" reloadable="false">
- if ( contextFile != null && contextFile.exists() )
- {
- fr = new FileReader( contextFile );
- Xpp3Dom xpp3Dom = Xpp3DomBuilder.build( fr );
- xpp3Dom.setAttribute( "backgroundProcessorDelay", Integer.toString( backgroundProcessorDelay ) );
- xpp3Dom.setAttribute( "reloadable", Boolean.toString( isContextReloadable() ) );
- Xpp3DomWriter.write( fw, xpp3Dom );
- Xpp3DomWriter.write( sw, xpp3Dom );
- getLog().debug( " generated context file " + sw.toString() );
- }
- else
- {
- if ( contextReloadable )
- {
- // don't care about using a complicated xml api to create one xml line :-)
- StringBuilder sb = new StringBuilder( "<Context " ).append( "backgroundProcessorDelay=\"" ).append(
- Integer.toString( backgroundProcessorDelay ) ).append( "\"" ).append(
- " reloadable=\"" + Boolean.toString( isContextReloadable() ) + "\"/>" );
-
- getLog().debug( " generated context file " + sb.toString() );
-
- fw.write( sb.toString() );
- }
- else
- {
- // no user context file and contextReloadable false so no need about creating a hack one
- return null;
- }
- }
- }
- catch ( IOException e )
- {
- getLog().error( "error creating fake context.xml : " + e.getMessage(), e );
- throw new MojoExecutionException( "error creating fake context.xml : " + e.getMessage(), e );
- }
- catch ( XmlPullParserException e )
- {
- getLog().error( "error creating fake context.xml : " + e.getMessage(), e );
- throw new MojoExecutionException( "error creating fake context.xml : " + e.getMessage(), e );
- }
- finally
- {
- IOUtil.close( fw );
- IOUtil.close( fr );
- IOUtil.close( sw );
- }
-
- return temporaryContextFile;
- }
-
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java
deleted file mode 100644
index 8af0122..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-
-/**
- * Runs the current project as a packaged web application using an embedded Tomcat server.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- * @todo depend on war:exploded when MNG-1649 resolved
- */
-@Mojo( name = "run-war", requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true )
-@Execute( phase = LifecyclePhase.PACKAGE )
-public class RunWarMojo
- extends AbstractRunWarMojo
-{
- // no-op : only mojo metadata overriding
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java
deleted file mode 100644
index 445e2b0..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-
-/**
- * Same as run-war goal without forking the package cycle.
- *
- * @author vlatombe
- */
-@Mojo( name = "run-war-only", requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true )
-public class RunWarOnlyMojo
- extends AbstractRunWarMojo
-{
- // no-op : only mojo metadata overriding
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java
deleted file mode 100644
index ea91edc..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Lists information about the Tomcat version, OS, and JVM properties.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "info", threadSafe = true )
-public class ServerInfoMojo
- extends AbstractCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "ServerInfoMojo.listInfo", getURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().getServerInfo();
-
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
deleted file mode 100644
index b04fead..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Lists session information for a WAR in Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "sessions", threadSafe = true )
-public class SessionsMojo
- extends AbstractWarCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "SessionsMojo.listSessions", getDeployedURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().getSessions( getPath() );
-
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
deleted file mode 100644
index 3e47eef..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
-
-
-/**
- * <p>
- * Shuts down all possibly started embedded Tomcat servers. This will be automatically done
- * through a shutdown hook or you may call this Mojo to shut them down explictly.
- * </p>
- * <p>
- * By default the <code>shutdown</code> goal is not bound to any phase. For integration tests
- * you might want to bind it to <code>post-integration-test</code>.
- * </p>
- *
- * @author Mark Michaelis
- * @since 1.1
- */
-@Mojo( name = "shutdown", requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true )
-public class ShutdownMojo
- extends AbstractI18NTomcat6Mojo
-{
-
- /**
- * Ignore error when shutdown
- *
- * @since 2.0
- */
- @Parameter( property = "maven.tomcat.skipErrorOnShutdown", defaultValue = "false" )
- protected boolean skipErrorOnShutdown;
-
- /**
- * Skip execution
- *
- * @since 2.0
- */
- @Parameter( property = "maven.tomcat.skipShutdown", defaultValue = "false" )
- protected boolean skip;
-
- /**
- * Shuts down all embedded tomcats which got started up to now.
- *
- * @throws MojoExecutionException if shutting down one or all servers failed
- */
- public void execute()
- throws MojoExecutionException
- {
- if ( skip )
- {
- getLog().info( "skip execution" );
- return;
- }
- try
- {
- EmbeddedRegistry.getInstance().shutdownAll( getLog() );
- }
- catch ( Exception e )
- {
- if ( !skipErrorOnShutdown )
- {
- throw new MojoExecutionException( messagesProvider.getMessage( "ShutdownMojo.shutdownError" ), e );
- }
- }
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
deleted file mode 100644
index 3719736..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Start a WAR in Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "start", threadSafe = true )
-public class StartMojo
- extends AbstractWarCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "StartMojo.startingApp", getDeployedURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().start( getPath() );
-
- /* TODO : Tomcat always return http status 200. How check message to know error or not,
- * cause is can be in french, english....
- */
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
deleted file mode 100644
index ccd9b75..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Stop a WAR in Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "stop", threadSafe = true )
-public class StopMojo
- extends AbstractWarCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "StopMojo.stoppingApp", getDeployedURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().stop( getPath() );
-
- /* TODO : Tomcat always return http status 200. How check message to know error or not,
- * cause is can be in french, english....
- */
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
deleted file mode 100644
index b248a1f..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
-
-import java.io.IOException;
-
-/**
- * Undeploy a WAR from Tomcat.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- */
-@Mojo( name = "undeploy", threadSafe = true )
-public class UndeployMojo
- extends AbstractWarCatalinaMojo
-{
- // ----------------------------------------------------------------------
- // Mojo Parameters
- // ----------------------------------------------------------------------
-
- /**
- * Whether to fail the build if the web application cannot be undeployed.
- */
- @Parameter( property = "maven.tomcat.failOnError", defaultValue = "true" )
- private boolean failOnError;
-
- // ----------------------------------------------------------------------
- // Protected Methods
- // ----------------------------------------------------------------------
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void invokeManager()
- throws MojoExecutionException, TomcatManagerException, IOException
- {
- getLog().info( messagesProvider.getMessage( "UndeployMojo.undeployingApp", getDeployedURL() ) );
-
- try
- {
- TomcatManagerResponse tomcatResponse = getManager().undeploy( getPath() );
-
- /* TODO : Tomcat always return http status 200. How check message to know error or not,
- * cause is can be in french, english....
- */
- checkTomcatResponse( tomcatResponse );
-
- log( tomcatResponse.getHttpResponseBody() );
- }
- catch ( TomcatManagerException exception )
- {
- if ( failOnError )
- {
- throw exception;
- }
-
- getLog().warn( messagesProvider.getMessage( "UndeployMojo.undeployError", exception.getMessage() ) );
- }
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/Webapp.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/Webapp.java
deleted file mode 100644
index c426024..0000000
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/Webapp.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.tomcat.maven.plugin.tomcat6;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.tomcat.maven.common.config.AbstractWebapp;
-
-/**
- * Webapp represents information specified in the plugin configuration section
- * for each webapp.
- *
- * @since 2.0
- */
-public class Webapp
- extends AbstractWebapp
-{
-
- public Webapp()
- {
- // default constructor
- }
-
- public Webapp( Artifact artifact )
- {
- super( artifact );
- }
-}
diff --git a/tomcat6-maven-plugin/src/main/resources/conf/tomcat-users.xml b/tomcat6-maven-plugin/src/main/resources/conf/tomcat-users.xml
deleted file mode 100644
index 7114f5d..0000000
--- a/tomcat6-maven-plugin/src/main/resources/conf/tomcat-users.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<tomcat-users>
-<!--
- <role rolename="tomcat"/>
- <role rolename="role1"/>
- <user username="tomcat" password="tomcat" roles="tomcat"/>
- <user username="both" password="tomcat" roles="tomcat,role1"/>
- <user username="role1" password="tomcat" roles="role1"/>
--->
-</tomcat-users>
diff --git a/tomcat6-maven-plugin/src/main/resources/conf/web.xml b/tomcat6-maven-plugin/src/main/resources/conf/web.xml
deleted file mode 100644
index 679abd7..0000000
--- a/tomcat6-maven-plugin/src/main/resources/conf/web.xml
+++ /dev/null
@@ -1,1200 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <!-- ======================== Introduction ============================== -->
- <!-- This document defines default values for *all* web applications -->
- <!-- loaded into this instance of Tomcat. As each application is -->
- <!-- deployed, this file is processed, followed by the -->
- <!-- "/WEB-INF/web.xml" deployment descriptor from your own -->
- <!-- applications. -->
- <!-- -->
- <!-- WARNING: Do not configure application-specific resources here! -->
- <!-- They should go in the "/WEB-INF/web.xml" file in your application. -->
-
-
- <!-- ================== Built In Servlet Definitions ==================== -->
-
-
- <!-- The default servlet for all web applications, that serves static -->
- <!-- resources. It processes all requests that are not mapped to other -->
- <!-- servlets with servlet mappings (defined either here or in your own -->
- <!-- web.xml file. This servlet supports the following initialization -->
- <!-- parameters (default values are in square brackets): -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- fileEncoding Encoding to be used to read static resources -->
- <!-- [platform default] -->
- <!-- -->
- <!-- input Input buffer size (in bytes) when reading -->
- <!-- resources to be served. [2048] -->
- <!-- -->
- <!-- listings Should directory listings be produced if there -->
- <!-- is no welcome file in this directory? [false] -->
- <!-- WARNING: Listings for directories with many -->
- <!-- entries can be slow and may consume -->
- <!-- significant proportions of server resources. -->
- <!-- -->
- <!-- output Output buffer size (in bytes) when writing -->
- <!-- resources to be served. [2048] -->
- <!-- -->
- <!-- readonly Is this context "read only", so HTTP -->
- <!-- commands like PUT and DELETE are -->
- <!-- rejected? [true] -->
- <!-- -->
- <!-- readmeFile File name to display with the directory -->
- <!-- contents. [null] -->
- <!-- -->
- <!-- sendfileSize If the connector used supports sendfile, this -->
- <!-- represents the minimal file size in KB for -->
- <!-- which sendfile will be used. Use a negative -->
- <!-- value to always disable sendfile. [48] -->
- <!-- -->
- <!-- For directory listing customization. Checks localXsltFile, then -->
- <!-- globalXsltFile, then defaults to original behavior. -->
- <!-- -->
- <!-- localXsltFile Make directory listings an XML doc and -->
- <!-- pass the result to this style sheet residing -->
- <!-- in that directory. This overrides -->
- <!-- globalXsltFile[null] -->
- <!-- -->
- <!-- globalXsltFile Site wide configuration version of -->
- <!-- localXsltFile This argument is expected -->
- <!-- to be a physical file. [null] -->
- <!-- -->
- <!-- -->
-
- <servlet>
- <servlet-name>default</servlet-name>
- <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>listings</param-name>
- <param-value>false</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
-
- <!-- The "invoker" servlet, which executes anonymous servlet classes -->
- <!-- that have not been defined in a web.xml file. Traditionally, this -->
- <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map -->
- <!-- it to other patterns as well. The extra path info portion of such a -->
- <!-- request must be the fully qualified class name of a Java class that -->
- <!-- implements Servlet (or extends HttpServlet), or the servlet name -->
- <!-- of an existing servlet definition. This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
-
-<!--
- <servlet>
- <servlet-name>invoker</servlet-name>
- <servlet-class>
- org.apache.catalina.servlets.InvokerServlet
- </servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
--->
-
-
- <!-- The JSP page compiler and execution servlet, which is the mechanism -->
- <!-- used by Tomcat to support JSP pages. Traditionally, this servlet -->
- <!-- is mapped to the URL pattern "*.jsp". This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- checkInterval If development is false and checkInterval is -->
- <!-- greater than zero, background compilations are -->
- <!-- enabled. checkInterval is the time in seconds -->
- <!-- between checks to see if a JSP page (and its -->
- <!-- dependent files) needs to be recompiled. [0] -->
- <!-- -->
- <!-- classdebuginfo Should the class file be compiled with -->
- <!-- debugging information? [true] -->
- <!-- -->
- <!-- classpath What class path should I use while compiling -->
- <!-- generated servlets? [Created dynamically -->
- <!-- based on the current web application] -->
- <!-- -->
- <!-- compiler Which compiler Ant should use to compile JSP -->
- <!-- pages. See the jasper documentation for more -->
- <!-- information. -->
- <!-- -->
- <!-- compilerSourceVM Compiler source VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
- <!-- compilerTargetVM Compiler target VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
- <!-- development Is Jasper used in development mode? If true, -->
- <!-- the frequency at which JSPs are checked for -->
- <!-- modification may be specified via the -->
- <!-- modificationTestInterval parameter. [true] -->
- <!-- -->
- <!-- displaySourceFragment -->
- <!-- Should a source fragment be included in -->
- <!-- exception messages? [true] -->
- <!-- -->
- <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
- <!-- dumped to a file? [false] -->
- <!-- False if suppressSmap is true -->
- <!-- -->
- <!-- enablePooling Determines whether tag handler pooling is -->
- <!-- enabled [true] -->
- <!-- -->
- <!-- engineOptionsClass Allows specifying the Options class used to -->
- <!-- configure Jasper. If not present, the default -->
- <!-- EmbeddedServletOptions will be used. -->
- <!-- -->
- <!-- errorOnUseBeanInvalidClassAttribute -->
- <!-- Should Jasper issue an error when the value of -->
- <!-- the class attribute in an useBean action is -->
- <!-- not a valid bean class? [true] -->
- <!-- -->
- <!-- fork Tell Ant to fork compiles of JSP pages so that -->
- <!-- a separate JVM is used for JSP page compiles -->
- <!-- from the one Tomcat is running in. [true] -->
- <!-- -->
- <!-- genStrAsCharArray Should text strings be generated as char -->
- <!-- arrays, to improve performance in some cases? -->
- <!-- [false] -->
- <!-- -->
- <!-- ieClassId The class-id value to be sent to Internet -->
- <!-- Explorer when using <jsp:plugin> tags. -->
- <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
- <!-- -->
- <!-- javaEncoding Java file encoding to use for generating java -->
- <!-- source files. [UTF8] -->
- <!-- -->
- <!-- keepgenerated Should we keep the generated Java source code -->
- <!-- for each page instead of deleting it? [true] -->
- <!-- -->
- <!-- mappedfile Should we generate static content with one -->
- <!-- print statement per input line, to ease -->
- <!-- debugging? [true] -->
- <!-- -->
- <!-- modificationTestInterval -->
- <!-- Causes a JSP (and its dependent files) to not -->
- <!-- be checked for modification during the -->
- <!-- specified time interval (in seconds) from the -->
- <!-- last time the JSP was checked for -->
- <!-- modification. A value of 0 will cause the JSP -->
- <!-- to be checked on every access. -->
- <!-- Used in development mode only. [4] -->
- <!-- -->
- <!-- scratchdir What scratch directory should we use when -->
- <!-- compiling JSP pages? [default work directory -->
- <!-- for the current web application] -->
- <!-- -->
- <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
- <!-- debugging be suppressed? [false] -->
- <!-- -->
- <!-- trimSpaces Should white spaces in template text between -->
- <!-- actions or directives be trimmed? [false] -->
- <!-- -->
- <!-- xpoweredBy Determines whether X-Powered-By response -->
- <!-- header is added by generated servlet [false] -->
- <!-- -->
- <!-- If you wish to use Jikes to compile JSP pages: -->
- <!-- Please see the "Using Jikes" section of the Jasper-HowTo -->
- <!-- page in the Tomcat documentation. -->
-
- <servlet>
- <servlet-name>jsp</servlet-name>
- <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
- <init-param>
- <param-name>fork</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>xpoweredBy</param-name>
- <param-value>false</param-value>
- </init-param>
- <load-on-startup>3</load-on-startup>
- </servlet>
-
-
- <!-- NOTE: An SSI Filter is also available as an alternative SSI -->
- <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
- <!-- -->
- <!-- Server Side Includes processing servlet, which processes SSI -->
- <!-- directives in HTML pages consistent with similar support in web -->
- <!-- servers like Apache. Traditionally, this servlet is mapped to the -->
- <!-- URL pattern "*.shtml". This servlet supports the following -->
- <!-- initialization parameters (default values are in square brackets): -->
- <!-- -->
- <!-- buffered Should output from this servlet be buffered? -->
- <!-- (0=false, 1=true) [0] -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- expires The number of seconds before a page with SSI -->
- <!-- directives will expire. [No default] -->
- <!-- -->
- <!-- isVirtualWebappRelative -->
- <!-- Should "virtual" paths be interpreted as -->
- <!-- relative to the context root, instead of -->
- <!-- the server root? (0=false, 1=true) [0] -->
- <!-- -->
- <!-- inputEncoding The encoding to assume for SSI resources if -->
- <!-- one is not available from the resource. -->
- <!-- [Platform default] -->
- <!-- -->
- <!-- outputEncoding The encoding to use for the page that results -->
- <!-- from the SSI processing. [UTF-8] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI servlet, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
-
-<!--
- <servlet>
- <servlet-name>ssi</servlet-name>
- <servlet-class>
- org.apache.catalina.ssi.SSIServlet
- </servlet-class>
- <init-param>
- <param-name>buffered</param-name>
- <param-value>1</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>expires</param-name>
- <param-value>666</param-value>
- </init-param>
- <init-param>
- <param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
- </init-param>
- <load-on-startup>4</load-on-startup>
- </servlet>
--->
-
-
- <!-- Common Gateway Includes (CGI) processing servlet, which supports -->
- <!-- execution of external applications that conform to the CGI spec -->
- <!-- requirements. Typically, this servlet is mapped to the URL pattern -->
- <!-- "/cgi-bin/*", which means that any CGI applications that are -->
- <!-- executed must be present within the web application. This servlet -->
- <!-- supports the following initialization parameters (default values -->
- <!-- are in square brackets): -->
- <!-- -->
- <!-- cgiPathPrefix The CGI search path will start at -->
- <!-- webAppRootDir + File.separator + this prefix. -->
- <!-- [WEB-INF/cgi] -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- executable Name of the exectuable used to run the -->
- <!-- script. [perl] -->
- <!-- -->
- <!-- parameterEncoding Name of parameter encoding to be used with -->
- <!-- CGI servlet. -->
- <!-- [System.getProperty("file.encoding","UTF-8")] -->
- <!-- -->
- <!-- passShellEnvironment Should the shell environment variables (if -->
- <!-- any) be passed to the CGI script? [false] -->
- <!-- -->
- <!-- IMPORTANT: To use the CGI servlet, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-cgi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-cgi.jar -->
-
-<!--
- <servlet>
- <servlet-name>cgi</servlet-name>
- <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>cgiPathPrefix</param-name>
- <param-value>WEB-INF/cgi</param-value>
- </init-param>
- <load-on-startup>5</load-on-startup>
- </servlet>
--->
-
-
- <!-- ================ Built In Servlet Mappings ========================= -->
-
-
- <!-- The servlet mappings for the built in servlets defined above. Note -->
- <!-- that, by default, the CGI and SSI servlets are *not* mapped. You -->
- <!-- must uncomment these mappings (or add them to your application's own -->
- <!-- web.xml deployment descriptor) to enable these services -->
-
- <!-- The mapping for the default servlet -->
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
- <!-- The mapping for the invoker servlet -->
-<!--
- <servlet-mapping>
- <servlet-name>invoker</servlet-name>
- <url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
--->
-
- <!-- The mapping for the JSP servlet -->
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jsp</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jspx</url-pattern>
- </servlet-mapping>
-
- <!-- The mapping for the SSI servlet -->
-<!--
- <servlet-mapping>
- <servlet-name>ssi</servlet-name>
- <url-pattern>*.shtml</url-pattern>
- </servlet-mapping>
--->
-
- <!-- The mapping for the CGI Gateway servlet -->
-
-<!--
- <servlet-mapping>
- <servlet-name>cgi</servlet-name>
- <url-pattern>/cgi-bin/*</url-pattern>
- </servlet-mapping>
--->
-
-
- <!-- ================== Built In Filter Definitions ===================== -->
-
- <!-- NOTE: An SSI Servlet is also available as an alternative SSI -->
- <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
- <!-- -->
- <!-- Server Side Includes processing filter, which processes SSI -->
- <!-- directives in HTML pages consistent with similar support in web -->
- <!-- servers like Apache. Traditionally, this filter is mapped to the -->
- <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will -->
- <!-- selectively enable/disable SSI processing based on mime types. For -->
- <!-- this to work you will need to uncomment the .shtml mime type -->
- <!-- definition towards the bottom of this file. -->
- <!-- The contentType init param allows you to apply SSI processing to JSP -->
- <!-- pages, javascript, or any other content you wish. This filter -->
- <!-- supports the following initialization parameters (default values are -->
- <!-- in square brackets): -->
- <!-- -->
- <!-- contentType A regex pattern that must be matched before -->
- <!-- SSI processing is applied. -->
- <!-- [text/x-server-parsed-html(;.*)?] -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- expires The number of seconds before a page with SSI -->
- <!-- directives will expire. [No default] -->
- <!-- -->
- <!-- isVirtualWebappRelative -->
- <!-- Should "virtual" paths be interpreted as -->
- <!-- relative to the context root, instead of -->
- <!-- the server root? (0=false, 1=true) [0] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI filter, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
-
-<!--
- <filter>
- <filter-name>ssi</filter-name>
- <filter-class>
- org.apache.catalina.ssi.SSIFilter
- </filter-class>
- <init-param>
- <param-name>contentType</param-name>
- <param-value>text/x-server-parsed-html(;.*)?</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>expires</param-name>
- <param-value>666</param-value>
- </init-param>
- <init-param>
- <param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
- </init-param>
- </filter>
--->
-
-
- <!-- ==================== Built In Filter Mappings ====================== -->
-
- <!-- The mapping for the SSI Filter -->
-<!--
- <filter-mapping>
- <filter-name>ssi</filter-name>
- <url-pattern>*.shtml</url-pattern>
- </filter-mapping>
--->
-
-
- <!-- ==================== Default Session Configuration ================= -->
- <!-- You can set the default session timeout (in minutes) for all newly -->
- <!-- created sessions by modifying the value below. -->
-
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
-
- <!-- ===================== Default MIME Type Mappings =================== -->
- <!-- When serving static resources, Tomcat will automatically generate -->
- <!-- a "Content-Type" header based on the resource's filename extension, -->
- <!-- based on these mappings. Additional mappings can be added here (to -->
- <!-- apply to all web applications), or in your own application's web.xml -->
- <!-- deployment descriptor. -->
-
- <mime-mapping>
- <extension>abs</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ai</extension>
- <mime-type>application/postscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aif</extension>
- <mime-type>audio/x-aiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aifc</extension>
- <mime-type>audio/x-aiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aiff</extension>
- <mime-type>audio/x-aiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aim</extension>
- <mime-type>application/x-aim</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>art</extension>
- <mime-type>image/x-jg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>asf</extension>
- <mime-type>video/x-ms-asf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>asx</extension>
- <mime-type>video/x-ms-asf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>au</extension>
- <mime-type>audio/basic</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>avi</extension>
- <mime-type>video/x-msvideo</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>avx</extension>
- <mime-type>video/x-rad-screenplay</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>bcpio</extension>
- <mime-type>application/x-bcpio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>bin</extension>
- <mime-type>application/octet-stream</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>bmp</extension>
- <mime-type>image/bmp</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>body</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>cdf</extension>
- <mime-type>application/x-cdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>cer</extension>
- <mime-type>application/x-x509-ca-cert</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>class</extension>
- <mime-type>application/java</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>cpio</extension>
- <mime-type>application/x-cpio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>csh</extension>
- <mime-type>application/x-csh</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dib</extension>
- <mime-type>image/bmp</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/msword</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dtd</extension>
- <mime-type>application/xml-dtd</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dv</extension>
- <mime-type>video/x-dv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dvi</extension>
- <mime-type>application/x-dvi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>eps</extension>
- <mime-type>application/postscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>etx</extension>
- <mime-type>text/x-setext</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>exe</extension>
- <mime-type>application/octet-stream</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gif</extension>
- <mime-type>image/gif</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gtar</extension>
- <mime-type>application/x-gtar</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gz</extension>
- <mime-type>application/x-gzip</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>hdf</extension>
- <mime-type>application/x-hdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>hqx</extension>
- <mime-type>application/mac-binhex40</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>htc</extension>
- <mime-type>text/x-component</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>htm</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>html</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>hqx</extension>
- <mime-type>application/mac-binhex40</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ief</extension>
- <mime-type>image/ief</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jad</extension>
- <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jar</extension>
- <mime-type>application/java-archive</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>java</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jnlp</extension>
- <mime-type>application/x-java-jnlp-file</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpe</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpeg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>js</extension>
- <mime-type>text/javascript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jsf</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jspf</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>kar</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>latex</extension>
- <mime-type>application/x-latex</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>m3u</extension>
- <mime-type>audio/x-mpegurl</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mac</extension>
- <mime-type>image/x-macpaint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>man</extension>
- <mime-type>application/x-troff-man</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mathml</extension>
- <mime-type>application/mathml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>me</extension>
- <mime-type>application/x-troff-me</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mid</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>midi</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mif</extension>
- <mime-type>application/x-mif</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mov</extension>
- <mime-type>video/quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>movie</extension>
- <mime-type>video/x-sgi-movie</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp1</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp2</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp3</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp4</extension>
- <mime-type>video/mp4</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpa</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpe</extension>
- <mime-type>video/mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpeg</extension>
- <mime-type>video/mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpega</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpg</extension>
- <mime-type>video/mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpv2</extension>
- <mime-type>video/mpeg2</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ms</extension>
- <mime-type>application/x-wais-source</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>nc</extension>
- <mime-type>application/x-netcdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>oda</extension>
- <mime-type>application/oda</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Database -->
- <extension>odb</extension>
- <mime-type>application/vnd.oasis.opendocument.database</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Chart -->
- <extension>odc</extension>
- <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Formula -->
- <extension>odf</extension>
- <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Drawing -->
- <extension>odg</extension>
- <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Image -->
- <extension>odi</extension>
- <mime-type>application/vnd.oasis.opendocument.image</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Master Document -->
- <extension>odm</extension>
- <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Presentation -->
- <extension>odp</extension>
- <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Spreadsheet -->
- <extension>ods</extension>
- <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Text -->
- <extension>odt</extension>
- <mime-type>application/vnd.oasis.opendocument.text</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ogg</extension>
- <mime-type>application/ogg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Drawing Template -->
- <extension>otg </extension>
- <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- HTML Document Template -->
- <extension>oth</extension>
- <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Presentation Template -->
- <extension>otp</extension>
- <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Spreadsheet Template -->
- <extension>ots</extension>
- <mime-type>application/vnd.oasis.opendocument.spreadsheet-template </mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Text Template -->
- <extension>ott</extension>
- <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pbm</extension>
- <mime-type>image/x-portable-bitmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pct</extension>
- <mime-type>image/pict</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pdf</extension>
- <mime-type>application/pdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pgm</extension>
- <mime-type>image/x-portable-graymap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pic</extension>
- <mime-type>image/pict</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pict</extension>
- <mime-type>image/pict</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pls</extension>
- <mime-type>audio/x-scpls</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>png</extension>
- <mime-type>image/png</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pnm</extension>
- <mime-type>image/x-portable-anymap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pnt</extension>
- <mime-type>image/x-macpaint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppm</extension>
- <mime-type>image/x-portable-pixmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/powerpoint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ps</extension>
- <mime-type>application/postscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>psd</extension>
- <mime-type>image/x-photoshop</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>qt</extension>
- <mime-type>video/quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>qti</extension>
- <mime-type>image/x-quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>qtif</extension>
- <mime-type>image/x-quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ras</extension>
- <mime-type>image/x-cmu-raster</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rdf</extension>
- <mime-type>application/rdf+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rgb</extension>
- <mime-type>image/x-rgb</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rm</extension>
- <mime-type>application/vnd.rn-realmedia</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>roff</extension>
- <mime-type>application/x-troff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rtf</extension>
- <mime-type>application/rtf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rtx</extension>
- <mime-type>text/richtext</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sh</extension>
- <mime-type>application/x-sh</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>shar</extension>
- <mime-type>application/x-shar</mime-type>
- </mime-mapping>
-<!--
- <mime-mapping>
- <extension>shtml</extension>
- <mime-type>text/x-server-parsed-html</mime-type>
- </mime-mapping>
--->
- <mime-mapping>
- <extension>smf</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sit</extension>
- <mime-type>application/x-stuffit</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>snd</extension>
- <mime-type>audio/basic</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>src</extension>
- <mime-type>application/x-wais-source</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sv4cpio</extension>
- <mime-type>application/x-sv4cpio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sv4crc</extension>
- <mime-type>application/x-sv4crc</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>swf</extension>
- <mime-type>application/x-shockwave-flash</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>t</extension>
- <mime-type>application/x-troff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tar</extension>
- <mime-type>application/x-tar</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tcl</extension>
- <mime-type>application/x-tcl</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tex</extension>
- <mime-type>application/x-tex</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>texi</extension>
- <mime-type>application/x-texinfo</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>texinfo</extension>
- <mime-type>application/x-texinfo</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tif</extension>
- <mime-type>image/tiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tiff</extension>
- <mime-type>image/tiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tr</extension>
- <mime-type>application/x-troff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tsv</extension>
- <mime-type>text/tab-separated-values</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>txt</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ulw</extension>
- <mime-type>audio/basic</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ustar</extension>
- <mime-type>application/x-ustar</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>vxml</extension>
- <mime-type>application/voicexml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xbm</extension>
- <mime-type>image/x-xbitmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xht</extension>
- <mime-type>application/xhtml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xhtml</extension>
- <mime-type>application/xhtml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xml</extension>
- <mime-type>application/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xpm</extension>
- <mime-type>image/x-xpixmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xsl</extension>
- <mime-type>application/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xslt</extension>
- <mime-type>application/xslt+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xul</extension>
- <mime-type>application/vnd.mozilla.xul+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xwd</extension>
- <mime-type>image/x-xwindowdump</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wav</extension>
- <mime-type>audio/x-wav</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svg</extension>
- <mime-type>image/svg+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svgz</extension>
- <mime-type>image/svg+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>vsd</extension>
- <mime-type>application/x-visio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- Wireless Bitmap -->
- <extension>wbmp</extension>
- <mime-type>image/vnd.wap.wbmp</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- WML Source -->
- <extension>wml</extension>
- <mime-type>text/vnd.wap.wml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- Compiled WML -->
- <extension>wmlc</extension>
- <mime-type>application/vnd.wap.wmlc</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- WML Script Source -->
- <extension>wmls</extension>
- <mime-type>text/vnd.wap.wmlscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- Compiled WML Script -->
- <extension>wmlscriptc</extension>
- <mime-type>application/vnd.wap.wmlscriptc</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wmv</extension>
- <mime-type>video/x-ms-wmv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wrl</extension>
- <mime-type>x-world/x-vrml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wspolicy</extension>
- <mime-type>application/wspolicy+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>Z</extension>
- <mime-type>application/x-compress</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>z</extension>
- <mime-type>application/x-compress</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zip</extension>
- <mime-type>application/zip</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/vnd.ms-word</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
-
- <!-- ==================== Default Welcome File List ===================== -->
- <!-- When a request URI refers to a directory, the default servlet looks -->
- <!-- for a "welcome file" within that directory and, if present, -->
- <!-- to the corresponding resource URI for display. If no welcome file -->
- <!-- is present, the default servlet either serves a directory listing, -->
- <!-- or returns a 404 status, depending on how it is configured. -->
- <!-- -->
- <!-- If you define welcome files in your own application's web.xml -->
- <!-- deployment descriptor, that list *replaces* the list configured -->
- <!-- here, so be sure that you include any of the default values that -->
- <!-- you wish to include. -->
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm b/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
deleted file mode 100644
index 7620ef9..0000000
--- a/tomcat6-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
+++ /dev/null
@@ -1,58 +0,0 @@
- ---
- Adding System Properties
- ---
- Olivier Lamy
- ---
- October 17, 2009
- ---
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Adding System Properties
-
- You can add system properties when running Tomcat (mvn tomcat6:run).
- The syntax has the following format:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <systemProperties>
- <example.value.1>alpha</example.value.1>
- <example.value.2>beta</example.value.2>
- </systemProperties>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
diff --git a/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm b/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
deleted file mode 100644
index dd975cf..0000000
--- a/tomcat6-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
+++ /dev/null
@@ -1,124 +0,0 @@
- ---
- Adjust Tomcat Version
- ---
- Mark Michaelis
- ---
- September 30, 2010
- ---
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Adjust Tomcat Version
-
- In case you need to adjust the version of the embedded tomcat to run you can do so by changing
- the runtime-dependencies:
-
-+--
-<project>
- [...]
- <properties>
- <tomcat.version>6.0.29</tomcat.version>
- [...]
- </properties>
- [...]
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>${tomcat.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina-ha</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tribes</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-jdt</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>dbcp</artifactId>
- <version>${tomcat.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
- [...]
- </plugins>
- </pluginManagement>
- [...]
- </build>
- [...]
-</project>
-+--
diff --git a/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm b/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
deleted file mode 100644
index c14e140..0000000
--- a/tomcat6-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
+++ /dev/null
@@ -1,128 +0,0 @@
- ---
- Introduction
- ---
- SZNAJDERMAN in Projet J4hr
- <http://www.jroller.com/Fabszn/entry/tomcat_7_et_le_plugin>
- ---
- 2010-07-05
- ---
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Tomcat 7 and Maven 2 plugin
-
- {{{http://www.jroller.com/Fabszn/entry/tomcat_7_et_le_plugin}Original Post (French)}}
-
- As part of my project J4hr, I set up for building the application, the tool Maven (v2). As an application server,
- I use the latest version of tomcat server, ie version 7.
-
- To facilitate deployment, I created the following Maven plugin: Plugin allowing integration of the two tools during the
- build and deployment.
-
- I met some problems for the integration of two tools using the plugin. Maven recommends: convention over configuration.
- That is, take the default conventions that have been fixed and therefore limited aspects, often heavy, configuration.
- This adage wrong between Maven 2 and Tomcat 7.
-
- That is the technical background:
-
- Maven 2
- Tomcat 7 (installed from a tar.gz file in the directory USER_HOME
- OpenJDK 1.6.0_18
- Ubuntu 4.10
-
- What happened??
- I added to my pom.xml, the declaration of this new artifact as described below:
-
-+----------------------------------------------+
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
-+----------------------------------------------+
-
-
- Launch the command:
-
- mvn tomcat: deploy
-
- and patatra! below the result in the console:
-
-+----------------------------------------------+
- [INFO] Deploying war to http://localhost:8080/j4hr
- [INFO]
- [ERROR] BUILD ERROR
- [INFO]
- [INFO] Can not invoke Tomcat manager
-+----------------------------------------------+
-
- Maven says it can not access the Tomcat manager, allowing it to deploy the war.
-
- In reading the documentation of the plugin, it tells us that the default url used is the result:
-
- http://localhost:8080/manager
-
- I type in my favorite browser (I hesitate between Chrome and Firefox) This url and voila the answer made to me by the
- server:
-
-
- The page you Tried to access (/manager/) does not exist.
-
- The Manager application has been "re-structured for Tomcat 7 onwards and sacrifice part of URLs Have Changed. All URLs
- Used to Access the Application Manager "should now start With One Of The followings options:
-
- * /Manager/html for the HTML GUI
-
- * /Manager/text for The Text interface
-
- * /Manager/jmxproxy pour la JMX Proxy
-
- * /Manager/status pages for The Status
-
-
- Note thats the URL for The Text interface has changed from "/manager" to "/manager/text".
-
- You Probably Need to adjust The URL you are using to access une application. However, There Is Always a chance Have
- you found a bug in une application. "If you are sure You Have Found a bug, and thats the bug has not Already Been
- Reported, Please report it to the Apache Tomcat team.
-
- Interesting, I tell you! Grosso modo, Tomcat is telling us that the standard URL that was used to administer the
- server for deployments has changed.
- Therefore, we configure our plugin in this new url that goes beyond the established conventions. So here is what to
- add to the pom.xml:
-
-+----------------------------------------------+
-<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <url>http://localhost:8080/manager/html</url>
- </configuration>
-</plugin>
-+----------------------------------------------+
-
-
- Normally with this information, everything should return to normal except for one thing.
- If the account administration server is not configured with the default values used when a new problem arises. It will
- be necessary to overcome this problem information identifiers in the file server setting.xml Maven pom.xml and reference in the name of this server.
-
- I hope it will help if you encounter this problem.
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm b/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm
deleted file mode 100644
index 0844ff2..0000000
--- a/tomcat6-maven-plugin/src/site/apt/examples/deployment.apt.vm
+++ /dev/null
@@ -1,384 +0,0 @@
- ---
- Deployment
- ---
- Mark Hobson
- <markhobson@gmail.com>
- ---
- 2010-02-15
- ---
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Deployment
-
- The plugin provides various methods of deployment to Tomcat:
-
- * {{{#Deploying_a_WAR_file}Deploying a WAR file}}
-
- * {{{#Deploying_an_exploded_WAR_directory}Deploying an exploded WAR directory}},
- with an optional <<<context.xml>>> file
-
- * {{{#Deploying_an_in-place_WAR_directory}Deploying an in-place WAR directory}},
- with an optional <<<context.xml>>> file
-
- * {{{#Deploying_a_context.xml_file}Deploying a <<<context.xml>>> file}}
-
- * {{{#Running_a_WAR_project}Running a WAR project}}
-
- []
-
- These are described in more detail below.
-
-* {Deploying a WAR file}
-
- The simplest way to deploy a WAR project to Tomcat is to type:
-
-+--
-mvn tomcat:deploy
-+--
-
- This goal will assemble and deploy the WAR file to Tomcat's manager using
- HTTP PUT.
-
-** Using a different WAR file location
-
- To specify a different WAR file location, add a plugin configuration block to
- your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <warFile>path/to/my/warFile.war</warFile>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default location is
- <<<$\{project.build.directory\}/$\{project.build.finalName\}.war>>>.
-
-** Using a <<<context.xml>>> file
-
- If you need to specify a <<<context.xml>>> file when deploying a WAR file to
- Tomcat, then it must be included within the WAR. The simplest way to achieve
- this is by adding it to your webapp resources:
-
-+--
-src
-|_ main
- |_ webapp
- |_ META-INF
- |_ context.xml
-+--
-
-* {Deploying an exploded WAR directory}
-
- To avoid building a WAR file upon deployment, a WAR directory can instead be
- deployed to Tomcat by typing:
-
-+--
-mvn war:exploded tomcat:exploded
-+--
-
-** Using a different WAR directory location
-
- To specify a different WAR directory location, add a plugin configuration
- block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <warDirectory>path/to/my/warDir</warDirectory>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default location is
- <<<$\{project.build.directory\}/$\{project.build.finalName\}>>>.
-
-** Using a <<<context.xml>>> file
-
- To supply a <<<context.xml>>> when deploying a WAR directory, add a plugin
- configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <mode>both</mode>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default <<<context.xml>>> file use is located at
- <<<src/main/webapp/META-INF/context.xml>>>.
-
-** Using a different <<<context.xml>>> file location
-
- To specify a different <<<context.xml>>> file location, add a plugin
- configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <contextFile>path/to/my/contextFile.xml</contextFile>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default location is
- <<<$\{project.build.directory\}/$\{project.build.finalName\}/META-INF/context.xml>>>.
-
-* {Deploying an in-place WAR directory}
-
- To avoid copying resources to the build directory, the webapp source directory
- can be deployed to Tomcat by typing:
-
-+--
-mvn war:inplace tomcat:inplace
-+--
-
-** Using a different WAR directory location
-
- To specify a different WAR directory location, add a plugin configuration
- block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <warSourceDirectory>path/to/my/warSourceDir</warSourceDirectory>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default location is <<<$\{basedir\}/src/main/webapp>>>.
-
-** Using a <<<context.xml>>> file
-
- To supply a <<<context.xml>>> when deploying a WAR directory to Tomcat, add a
- plugin configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <mode>both</mode>
- </configuration>
- </plugin>
- </plugins>
- </build>
- ...
-</project>
-+--
-
- The default <<<context.xml>>> file used is located at
- <<<src/main/webapp/META-INF/context.xml>>>.
-
-** Using a different <<<context.xml>>> file location
-
- To specify a different <<<context.xml>>> file location, add a plugin
- configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <contextFile>path/to/my/contextFile.xml</contextFile>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default location is
- <<<$\{project.build.directory\}/$\{project.build.finalName\}/META-INF/context.xml>>>.
-
-* {Deploying a context.xml file}
-
- To simply deploy just a <<<context.xml>>> file to Tomcat:
-
- [[1]] Add a plugin configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <mode>context</mode>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- [[2]] Deploy the <<<context.xml>>> file by typing:
-
-+--
-mvn tomcat:deploy
-+--
-
- []
-
- The default <<<context.xml>>> file used is located at
- <<<src/main/webapp/META-INF/context.xml>>>.
-
-** Using a different <<<context.xml>>> file location
-
- To specify a different <<<context.xml>>> file location, add a plugin
- configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <contextFile>path/to/my/contextFile.xml</contextFile>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default location is
- <<<$\{project.build.directory\}/$\{project.build.finalName\}/META-INF/context.xml>>>.
-
-* {Running a WAR project}
-
- A WAR project can be run under an embedded Tomcat server by typing:
-
-+--
-mvn tomcat:run
-+--
-
- To stop the embedded server, press <<<CTRL+C>>>.
diff --git a/tomcat6-maven-plugin/src/site/apt/index.apt.vm b/tomcat6-maven-plugin/src/site/apt/index.apt.vm
deleted file mode 100644
index d3ce920..0000000
--- a/tomcat6-maven-plugin/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,53 +0,0 @@
- ---
- Introduction
- ---
- Mark Hobson
- <markhobson@gmail.com>
- ---
- 2010-02-15
- ---
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Tomcat Maven Plugin
-
- The Tomcat6 Maven Plugin provides goals to manipulate WAR projects within the {{{http://tomcat.apache.org/}Tomcat}} servlet container version 6.x .
-
-* Goals Overview
-
- The goals for this plugin come in two categories:
-
- * {{{${project.url}/context-goals.html}Goals to manipulate deployed projects within Tomcat}}
-
- * {{{${project.url}/container-goals.html}Goals to obtain information from Tomcat}}
-
-* Usage
-
- Instructions on how to use the Tomcat Maven Plugin can be found on the {{{./usage.html}usage page}}.
-
-* Examples
-
- To provide you with better understanding of some usages of the Tomcat Maven Plugin,
- you can take a look into the following examples:
-
- * {{{./examples/add-system-properties.html}Adding System Properties}}
-
- * {{{./examples/deployment.html}How to deploy projects to Tomcat}}
diff --git a/tomcat6-maven-plugin/src/site/apt/usage.apt.vm b/tomcat6-maven-plugin/src/site/apt/usage.apt.vm
deleted file mode 100644
index af1da52..0000000
--- a/tomcat6-maven-plugin/src/site/apt/usage.apt.vm
+++ /dev/null
@@ -1,183 +0,0 @@
- ---
- Usage
- ---
- Mark Hobson
- <markhobson@gmail.com>
- ---
- 2010-03-09
- ---
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Usage
-
- If no explicit configuration is provided then the Tomcat Maven Plugin defaults to
- the following:
-
- * Tomcat manager URL of <<<http://localhost:8080/manager>>>
-
- * Authentication details of username <<<admin>>> and no password
-
- * Context path of <<</$\{project.artifactId\}>>>
-
- []
-
- These can be overridden as described below.
-
-* Using a different Tomcat manager URL
-
- To configure the plugin for a different Tomcat instance, add a plugin
- configuration block to your <<<pom.xml>>> as follows:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <url>http://www.mydomain.com:1234/mymanager</url>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- The default Tomcat manager URL is <<<http://localhost:8080/manager>>>.
-
-* Using different Tomcat manager authentication details
-
- To specify a different username and password to use when authenticating with
- Tomcat manager:
-
- [[1]] Add a plugin configuration block to your <<<pom.xml>>>:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <server>myserver</server>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- [[2]] Add a corresponding <<<server>>> block to your <<<settings.xml>>>:
-
-+--
-<settings>
- ...
- <servers>
- ...
- <server>
- <id>myserver</id>
- <username>myusername</username>
- <password>mypassword</password>
- </server>
- ...
- </servers>
- ...
-</settings>
-+--
-
- []
-
- The default authentication details are username <<<admin>>> and no password.
-
-* Using a different context path
-
- The default context path is <<</$\{project.artifactId\}>>>.
-
- To change the context path to <<</mycontext>>> configure the plugin like this:
-
-+--
-<project>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <path>/mycontext</path>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
-
- If you are using <<<project.build.finalName>>> to change the name of your WAR
- file, you can use that value when you configure the context path as well. To do
- that add the following configuration block to your <<<pom.xml>>>:
-
-+--
-<project>
- ...
- <build>
- ...
- <finalName>mycontext</finalName>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <path>/\${project.build.finalName}</path>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-</project>
-+--
diff --git a/tomcat6-maven-plugin/src/site/fml/faq.fml b/tomcat6-maven-plugin/src/site/fml/faq.fml
deleted file mode 100644
index 65dd07c..0000000
--- a/tomcat6-maven-plugin/src/site/fml/faq.fml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<faqs title="Frequently Asked Questions">
-
- <part id="faq">
-
- <faq id="war-deploy">
- <question>
- Why do I have to specify a <code>war</code> goal when running
- <code>tomcat:exploded</code> or <code>tomcat:inplace</code> ?
- </question>
- <answer>
- Because there's currently no way for a goal to depend upon
- another plugin's goal. See
- <a href="http://jira.codehaus.org/browse/MNG-1649">MNG-1649</a>
- for more information.
- </answer>
- </faq>
-
- <faq id="war-redeploy">
- <question>
- Why do I have to specify a <code>war</code> goal when running
- <code>tomcat:redeploy</code> ?
- </question>
- <answer>
- Because the different methods of deployment have different
- prerequisites - it would be tiresome to always package the WAR
- if you were just deploying an exploded WAR.
- </answer>
- </faq>
-
- </part>
-
-</faqs>
diff --git a/tomcat6-maven-plugin/src/site/site.xml b/tomcat6-maven-plugin/src/site/site.xml
deleted file mode 100644
index b2b9278..0000000
--- a/tomcat6-maven-plugin/src/site/site.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
- <body>
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- <item name="Goals" href="plugin-info.html"/>
- <item name="Usage" href="usage.html"/>
- <item name="FAQ" href="faq.html"/>
- </menu>
- <menu name="Examples">
- <item name="Adding System Properties" href="examples/add-system-properties.html"/>
- <item name="Adjust Tomcat Version" href="examples/adjust-embedded-tomcat-version.html"/>
- <item name="Deployment" href="examples/deployment.html"/>
- <item name="Deployment to Tomcat 7" href="examples/deployment-tomcat7.html"/>
- </menu>
-
- <menu ref="reports"/>
-
- <menu name="ASF">
- <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
- <item name="Foundation" href="http://www.apache.org/foundation/"/>
- <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
- <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
- </menu>
-
- </body>
-</project>
diff --git a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java b/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java
deleted file mode 100644
index fca7023..0000000
--- a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarOnlyProjectIT.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.tomcat.maven.it;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.tomcat.maven.it.AbstractDeployWarOnlyProjectIT;
-
-/**
- * @author Olivier Lamy
- */
-public class Tomcat6DeployWarOnlyProjectIT
- extends AbstractDeployWarOnlyProjectIT
-{
- // no op
-
-}
diff --git a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarProjectIT.java b/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarProjectIT.java
deleted file mode 100644
index 0a144a2..0000000
--- a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6DeployWarProjectIT.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.tomcat.maven.it;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.tomcat.maven.it.AbstractDeployWarProjectIT;
-
-/**
- * @author Olivier Lamy
- */
-public class Tomcat6DeployWarProjectIT
- extends AbstractDeployWarProjectIT
-{
- // no op
-
-}
diff --git a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java b/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
deleted file mode 100644
index 4b1aa6e..0000000
--- a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.tomcat.maven.it;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.VerificationException;
-import org.apache.tomcat.maven.it.AbstractTomcatRunMultiConfigIT;
-
-/**
- * @author Olivier Lamy
- */
-public class Tomcat6RunMultiConfigIT
- extends AbstractTomcatRunMultiConfigIT
-{
- @Override
- protected void verifyConnectorsStarted()
- throws VerificationException
- {
- verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" + getHttpItPort());
- verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" + getHttpsItPort());
- verifier.verifyTextInLog("INFO: JK: ajp13 listening on /0.0.0.0:" + getAjpItPort());
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6SimpleWarProjectIT.java b/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6SimpleWarProjectIT.java
deleted file mode 100644
index 7ce41ec..0000000
--- a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6SimpleWarProjectIT.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.tomcat.maven.it;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.VerificationException;
-import org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT;
-
-/**
- * @author Olivier Lamy
- */
-public class Tomcat6SimpleWarProjectIT
- extends AbstractSimpleWarProjectIT
-{
- @Override
- protected void verifyConnectorsStarted()
- throws VerificationException
- {
- verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" + getHttpItPort());
- verifier.verifyTextInLog("INFO: JK: ajp13 listening on /0.0.0.0:" + getAjpItPort());
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6UsageContextpathIT.java b/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6UsageContextpathIT.java
deleted file mode 100644
index 54e1fb9..0000000
--- a/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6UsageContextpathIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.tomcat.maven.it;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.tomcat.maven.it.AbstractUsageContextpathIT;
-
-/**
- * @author Olivier Lamy
- */
-public class Tomcat6UsageContextpathIT
- extends AbstractUsageContextpathIT
-{
- // no op
-}
diff --git a/tomcat6-maven-plugin/src/test/keystore b/tomcat6-maven-plugin/src/test/keystore
deleted file mode 100644
index 016d596..0000000
--- a/tomcat6-maven-plugin/src/test/keystore
+++ /dev/null
Binary files differ
diff --git a/tomcat6-maven-plugin/src/test/manager.war b/tomcat6-maven-plugin/src/test/manager.war
deleted file mode 100644
index 065cd9d..0000000
--- a/tomcat6-maven-plugin/src/test/manager.war
+++ /dev/null
Binary files differ
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
deleted file mode 100644
index b61aed0..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run-war-only</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <path>/foo</path>
- <serverXml>src/main/tomcatconf/server.xml</serverXml>
- <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-deploy</id>
- <phase>integration-test</phase>
- <goals>
- <goal>deploy-only</goal>
- </goals>
- <configuration>
- <url>http://localhost:${its.http.port}/manager</url>
- <path>/bar</path>
- <warFile>${warTestPath}</warFile>
- <username>tomcat</username>
- <password>tomcat</password>
- <tag>test</tag>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
deleted file mode 100644
index 11925e4..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
deleted file mode 100644
index df3dac5..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-3manager.org.apache.juli.FileHandler.level = FINE
-3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-3manager.org.apache.juli.FileHandler.prefix = manager.
-
-4host-manager.org.apache.juli.FileHandler.level = FINE
-4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-org.apache.catalina.realm.MemoryRealm = FINE
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
deleted file mode 100644
index 73f3317..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<Server port="${its.server.port}" shutdown="SHUTDOWN">
-
- <GlobalNamingResources>
- <!-- Used by Manager webapp -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <Service name="Catalina">
- <Connector port="${its.http.port}" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
- <Engine name="Catalina" defaultHost="localhost">
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false" pattern="%t-ip:%a-protocol::%H-status:%s-localPort:%p-path:%U-time:%D ms" buffered="false"/>
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase" />
- <Host name="localhost" appBase="${project.build.directory}/test-classes/deploy-only-war-project/target/tomcat/webapps">
- <Context path="/manager" privileged="true" docBase="${managerWebAppPath}/manager"/>
- </Host>
- </Engine>
-
- </Service>
-</Server>
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
deleted file mode 100644
index 5f83bf5..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<tomcat-users>
-<!--
- <role rolename="tomcat"/>
- <role rolename="role1"/>
- <user username="tomcat" password="tomcat" roles="tomcat"/>
- <user username="both" password="tomcat" roles="tomcat,role1"/>
- <user username="role1" password="tomcat" roles="role1"/>
--->
- <role rolename="manager"/>
- <role rolename="manager-gui"/>
- <role rolename="manager-script"/>
- <user username="admin" password="admin123" roles="manager,manager-gui,manager-script" />
- <user username="tomcat" password="tomcat" roles="manager"/>
-</tomcat-users>
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
deleted file mode 100644
index 2197216..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-It works !!
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
deleted file mode 100644
index 3507562..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-
-</web-app>
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java b/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
deleted file mode 100644
index 4c020c6..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
deleted file mode 100644
index ab86b54..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run-war-only</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <fork>true</fork>
- <path>/foo</path>
- <serverXml>src/main/tomcatconf/server.xml</serverXml>
- <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-deploy</id>
- <phase>integration-test</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <url>http://localhost:${its.http.port}/manager</url>
- <username>tomcat</username>
- <password>tomcat</password>
- <path>/foo</path>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
deleted file mode 100644
index 11925e4..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
deleted file mode 100644
index df3dac5..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-3manager.org.apache.juli.FileHandler.level = FINE
-3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-3manager.org.apache.juli.FileHandler.prefix = manager.
-
-4host-manager.org.apache.juli.FileHandler.level = FINE
-4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-org.apache.catalina.realm.MemoryRealm = FINE
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
deleted file mode 100644
index 960ba62..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<Server port="${its.server.port}" shutdown="SHUTDOWN">
-
- <GlobalNamingResources>
- <!-- Used by Manager webapp -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <Service name="Catalina">
- <Connector port="${its.http.port}" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
- <Engine name="Catalina" defaultHost="localhost">
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false" pattern="%t-ip:%a-protocol::%H-status:%s-localPort:%p-path:%U-time:%D ms" buffered="false"/>
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase" />
- <Host name="localhost" appBase="${project.build.directory}/test-classes/deploy-war-project/target/tomcat/webapps">
- <Context path="/manager" privileged="true" docBase="${managerWebAppPath}/manager"/>
- </Host>
- </Engine>
-
- </Service>
-</Server>
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
deleted file mode 100644
index 5f83bf5..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<tomcat-users>
-<!--
- <role rolename="tomcat"/>
- <role rolename="role1"/>
- <user username="tomcat" password="tomcat" roles="tomcat"/>
- <user username="both" password="tomcat" roles="tomcat,role1"/>
- <user username="role1" password="tomcat" roles="role1"/>
--->
- <role rolename="manager"/>
- <role rolename="manager-gui"/>
- <role rolename="manager-script"/>
- <user username="admin" password="admin123" roles="manager,manager-gui,manager-script" />
- <user username="tomcat" password="tomcat" roles="manager"/>
-</tomcat-users>
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
deleted file mode 100644
index 2197216..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-It works !!
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
deleted file mode 100644
index 3507562..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-
-</web-app>
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java b/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
deleted file mode 100644
index 4c020c6..0000000
--- a/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml b/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml
deleted file mode 100644
index eef73d8..0000000
--- a/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-
-<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </appenders>
- <loggers>
-
- <root level="info">
- <appender-ref ref="console"/>
- </root>
- </loggers>
-</configuration>
-
-
diff --git a/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml b/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
deleted file mode 100644
index 2625aec..0000000
--- a/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>simple-war-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <port>${its.http.port}</port>
- <ajpPort>${its.ajp.port}</ajpPort>
- <fork>true</fork>
- <path>/</path>
- <systemProperties>
- <com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>shutdown</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt b/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
deleted file mode 100644
index 11925e4..0000000
--- a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml b/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
deleted file mode 100644
index 76ab562..0000000
--- a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<Server port="8010" shutdown="SHUTDOWN">
-
- <GlobalNamingResources>
- <!-- Used by Manager webapp -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <Service name="Catalina">
- <Connector port="8080" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
- <Connector port="8088" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
- <Engine name="Catalina" defaultHost="localhost">
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- resolveHosts="false" pattern="%t-ip:%a-protocol:%H-localPort:%p-path:%U-time:%D ms"/>
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase" />
- <Host name="localhost" appBase="webapps" />
- </Engine>
-
- </Service>
-</Server>
diff --git a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp b/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp
deleted file mode 100644
index 2197216..0000000
--- a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-It works !!
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml b/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml
deleted file mode 100644
index 7cddd47..0000000
--- a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-
-</web-app>
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java b/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java
deleted file mode 100644
index 4c020c6..0000000
--- a/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml b/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
deleted file mode 100644
index 177934a..0000000
--- a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>tomcat-run-multi-config</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <properties>
- <!-- Set to false if you want to debug the tomcat -->
- <maven.tomcat.fork>true</maven.tomcat.fork>
- <pluginVersion>${project.version}</pluginVersion>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <webXml>src/main/webapp/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <additionalConfigFilesDir>\${basedir}/src/main/tcconf</additionalConfigFilesDir>
- <configurationDir>\${project.build.directory}/tc</configurationDir>
- <path>/multi-config</path>
- <port>${its.http.port}</port>
- <httpsPort>${its.https.port}</httpsPort>
- <keystoreFile>${keystoreTestPath}</keystoreFile>
- <ajpPort>${its.ajp.port}</ajpPort>
- <uriEncoding>UTF-8</uriEncoding>
- <systemProperties>
- <com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt b/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
deleted file mode 100644
index 11925e4..0000000
--- a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file
diff --git a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp b/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
deleted file mode 100644
index 6fa84f6..0000000
--- a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Example</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body>
-<p>
-<c:choose>
- <c:when test="${empty param.string}">
- Not set.
- </c:when>
- <c:otherwise>
- String: <b><c:out value="${param.string}" /></b>!
- </c:otherwise>
-</c:choose>
-</p>
-</body>
-</html>
-
-
-
diff --git a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml b/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml
deleted file mode 100644
index 96c7790..0000000
--- a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-<jsp-config>
- <taglib>
- <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
- <taglib-location>/WEB-INF/tld/c.tld</taglib-location>
- </taglib>
-</jsp-config>
- <!--
- <taglib>
- <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
- <taglib-location>/WEB-INF/c.tld</taglib-location>
- </taglib>
--->
-
-</web-app>
diff --git a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java b/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
deleted file mode 100644
index 4c020c6..0000000
--- a/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml b/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml
deleted file mode 100644
index 5840178..0000000
--- a/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tomcat.maven.it</groupId>
- <artifactId>usage-contextpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <properties>
- <pluginVersion>${project.version}</pluginVersion>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>tomcat-run</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <port>${its.http.port}</port>
- <fork>true</fork>
- <path>/lorem</path>
- </configuration>
- </execution>
- <execution>
- <id>tomcat-shutdown</id>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>2.5.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html b/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html
deleted file mode 100644
index 8562c81..0000000
--- a/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <title>Usage-Example: Contextpath</title>
-</head>
-<body>
-Success!
-</body>
-</html>
diff --git a/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java b/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java
deleted file mode 100644
index 209b7d7..0000000
--- a/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java
+++ /dev/null
@@ -1,31 +0,0 @@
-import org.junit.Test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-
-@SuppressWarnings({"WrongPackageStatement"})
-public final class WaitIT {
- @Test
- public void testWait() throws Exception {
- System.out.println("Just wait a while...");
- Thread.sleep(${it.sleep.time});
- }
-}
diff --git a/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war b/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
deleted file mode 100644
index b0315c9..0000000
--- a/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
+++ /dev/null
Binary files differ
diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
index a67653a..23620a4 100644
--- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
+++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
@@ -341,8 +341,8 @@
* 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")
diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
index 237d645..9059483 100644
--- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
+++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
@@ -343,8 +343,8 @@
* 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" )
