Author: olamy
Date: Wed Oct 12 23:13:58 2011
New Revision: 1182615
URL: http://svn.apache.org/viewvc?rev=1182615&view=rev
Log:
remove exploded manager webapp and use a war to avoid too much io during
copying test resources
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/manager.war
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
- copied, changed from r1182609,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/manager.war
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
- copied, changed from r1182609,
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
Removed:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/401.jsp
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/403.jsp
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/META-INF/context.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/WEB-INF/jsp/sessionsList.jsp
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/WEB-INF/web.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/add.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/asf-logo.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/code.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/design.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/docs.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/fix.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/tomcat.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/update.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/void.gif
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/status.xsd
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/manager/xform.xsl
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/401.jsp
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/403.jsp
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/META-INF/context.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/WEB-INF/jsp/sessionsList.jsp
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/WEB-INF/web.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/add.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/asf-logo.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/code.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/design.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/docs.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/fix.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/tomcat.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/update.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/images/void.gif
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/status.xsd
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/manager/xform.xsl
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1182615&r1=1182614&r2=1182615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Wed Oct 12 23:13:58
2011
@@ -35,6 +35,7 @@
<properties>
<tomcat.version>6.0.33</tomcat.version>
+ <managerWebAppPath>${basedir}/target/</managerWebAppPath>
</properties>
<prerequisites>
<maven>${mavenVersion}</maven>
@@ -196,6 +197,25 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <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>
Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/manager.war
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/manager.war?rev=1182615&view=auto
==============================================================================
Files tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/manager.war
(added) and tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/manager.war
Wed Oct 12 23:13:58 2011 differ
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml?rev=1182615&r1=1182614&r2=1182615&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
Wed Oct 12 23:13:58 2011
@@ -36,7 +36,7 @@
<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="${project.build.directory}/test-classes/deploy-war-project/src/manager"/>
+ <Context path="/manager" privileged="true"
docBase="${managerWebAppPath}/manager"/>
</Host>
</Engine>
Copied:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
(from r1182609,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war?p2=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war&r1=1182609&r2=1182615&rev=1182615&view=diff
==============================================================================
(empty)
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1182615&r1=1182614&r2=1182615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Wed Oct 12 23:13:58
2011
@@ -34,6 +34,7 @@
<properties>
<tomcat.version>7.0.22</tomcat.version>
+ <managerWebAppPath>${basedir}/target/</managerWebAppPath>
</properties>
<dependencies>
@@ -212,6 +213,25 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <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>
Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/manager.war
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/manager.war?rev=1182615&view=auto
==============================================================================
Files tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/manager.war
(added) and tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/manager.war
Wed Oct 12 23:13:58 2011 differ
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml?rev=1182615&r1=1182614&r2=1182615&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
Wed Oct 12 23:13:58 2011
@@ -36,7 +36,7 @@
<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="${project.build.directory}/test-classes/deploy-war-project/src/manager"/>
+ <Context path="/manager" privileged="true"
docBase="${managerWebAppPath}/manager"/>
</Host>
</Engine>
Copied:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
(from r1182609,
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war?p2=tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war&p1=tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war&r1=1182609&r2=1182615&rev=1182615&view=diff
==============================================================================
(empty)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
