svn commit: r1173886 - in /tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test: project-resources/simple-war-project/ project-resources/simple-war-project/src/main/tomcatconf/ project-resources/simple-war-project/src/main/webapp/ project-resource...

[ol...@apache.org]

Author: olamy
Date: Wed Sep 21 21:59:04 2011
New Revision: 1173886

URL: http://svn.apache.org/viewvc?rev=1173886&view=rev
Log:
prepare a reusable set of integration for both versions of the plugin

Added:
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/pom.xml
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/empty.txt
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/server.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/index.jsp
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/index.jsp
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/web.xml
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/web.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/test/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/test/java/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/test/java/WaitIT.java
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/test/java/WaitIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/pom.xml
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/tcconf/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/index.jsp
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/web.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/test/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/test/java/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/test/java/WaitIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/pom.xml
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/main/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/main/webapp/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/main/webapp/index.html
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/main/webapp/index.html
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/test/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/test/java/
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/test/java/WaitIT.java
      - copied, changed from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/test/java/WaitIT.java
Removed:
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/empty.txt
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/server.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/index.jsp
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/web.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/test/java/WaitIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/index.jsp
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/web.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/test/java/WaitIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/main/webapp/index.html
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/test/java/WaitIT.java

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/pom.xml (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/pom.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/pom.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/pom.xml&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/empty.txt)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/empty.txt&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/server.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/tomcatconf/server.xml&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/index.jsp (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/index.jsp?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/index.jsp&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/index.jsp&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/web.xml (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/web.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/web.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/main/webapp/web.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/main/webapp/web.xml&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/test/java/WaitIT.java (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/test/java/WaitIT.java)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/test/java/WaitIT.java?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/simple-war-project/src/test/java/WaitIT.java&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/simple-war-project/src/test/java/WaitIT.java&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/pom.xml (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/pom.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/pom.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/pom.xml&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/tcconf/empty.txt)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/tcconf/empty.txt&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/index.jsp&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/web.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/main/webapp/web.xml&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/test/java/WaitIT.java)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/tomcat-run-multi-config/src/test/java/WaitIT.java&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/pom.xml (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/pom.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/pom.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/pom.xml&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/main/webapp/index.html (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/main/webapp/index.html)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/main/webapp/index.html?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/main/webapp/index.html&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/main/webapp/index.html&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)

Copied: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/test/java/WaitIT.java (from r1173884, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/test/java/WaitIT.java)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/test/java/WaitIT.java?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/resources/usage-contextpath/src/test/java/WaitIT.java&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/project-resources/usage-contextpath/src/test/java/WaitIT.java&r1=1173884&r2=1173886&rev=1173886&view=diff
==============================================================================
    (empty)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org