geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r501716 [1/2] - in /geronimo/server/trunk/testsuite: ./ deployment-testsuite/manifestcp-tests/manifestcp-ear/ enterprise-testsuite/jms-tests/jms-ear/ enterprise-testsuite/jms-tests/jms-war/ enterprise-testsuite/jpa-tests/jpa-ear/ enterprise...
Date Wed, 31 Jan 2007 03:48:55 GMT
Author: prasad
Date: Tue Jan 30 19:48:48 2007
New Revision: 501716

URL: http://svn.apache.org/viewvc?view=rev&rev=501716
Log:
* deleted unused itests
* configured war-plugin at top to filter webapp resources
* configured ear-plugin at top to use filtered resourcesDir
* added test-jetty, test-security, test-tomcat, test-web-references (Thanx Krish)
* beautified some poms
* changed pkg names of java files in test-jsps and test-servlets

Added:
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/index.html   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/testsuite/tomcat/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/testsuite/tomcat/TestTomcat.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/test/resources/testng.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/resources/testng.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocal.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalBean.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalHome.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/Test.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestBean.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestHome.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/Test.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestBean.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestHome.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/resources/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/resources/META-INF/ejb-jar.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/TomcatTestServlet.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorld.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldService.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldWS.java   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/hello-mapping.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/webservices.xml   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/wsdl/
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/wsdl/hello.wsdl   (with props)
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/index.html   (with props)
Removed:
    geronimo/server/trunk/testsuite/itests/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/java/com/
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/
Modified:
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Tue Jan 30 19:48:48 2007
@@ -54,13 +54,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Tue Jan 30 19:48:48 2007
@@ -50,13 +50,6 @@
     </dependencies>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Tue Jan 30 19:48:48 2007
@@ -59,23 +59,6 @@
             <scope>provided</scope>
         </dependency>
 
-
     </dependencies>
-    
-    <build>
-        <plugins>
-            <!--
-            FIXME: Need to reset the default values here since our parent sets up wars
-                   for use with jspc.  Remove once parent pom has been fixed.
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Tue Jan 30 19:48:48 2007
@@ -45,14 +45,6 @@
     </dependencies>
 
     <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Tue Jan 30 19:48:48 2007
@@ -55,23 +55,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.0.1</version>
-                <configuration>
-                    <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                    <archiveClasses>true</archiveClasses>
-                    <archive>
-                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-   
 </project>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Tue Jan 30 19:48:48 2007
@@ -17,25 +17,19 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <!-- $Rev$ $Date$ -->
-
 <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>
-
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
     <groupId>org.apache.geronimo.testsuite</groupId>
     <artifactId>testsuite</artifactId>
     <name>Geronimo TestSuite</name>
     <packaging>pom</packaging>
-
     <description>
         Geronimo integration testsuite. This contains 2 profiles, default and child.
         The default profile is used by the top level suites directly under this. The child profile is used by the test poms under the suites.
@@ -45,8 +39,6 @@
         The test poms under the suites should have this pom as their parent and set their relativePath appropriately
         The test poms under the suites inherit an empty 'child' profile from here. But any other build executions within the test poms should all be inside a 'child' profile.
     </description>
-
-
     <dependencyManagement>
         <dependencies>
             <!-- testsupport-selenium brings with it testsupport-common, selenium and testng dependencies -->
@@ -58,14 +50,12 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-selenium</artifactId>
         </dependency>
     </dependencies>
-
     <modules>
         <module>console-testsuite</module>
         <module>deployment-testsuite</module>
@@ -73,8 +63,13 @@
         <module>web-testsuite</module>
         <module>webservices-testsuite</module>
     </modules>
-
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -82,13 +77,34 @@
                     <artifactId>selenium-maven-plugin</artifactId>
                     <version>${version}</version>
                 </plugin>
-
                 <plugin>
                     <groupId>org.apache.geronimo.plugins</groupId>
                     <artifactId>testsuite-maven-plugin</artifactId>
                     <version>${version}</version>
                 </plugin>
-
+                <plugin>
+                    <artifactId>maven-ear-plugin</artifactId>
+                    <configuration>
+                        <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                    </configuration>
+                </plugin>
+                <!--
+                     FIXME: Need to reset the default values here since our parent sets up wars
+                     for use with jspc.  Remove once parent pom has been fixed.
+                 -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                        <webResources>
+                            <resource>
+                                <directory>${pom.basedir}/src/main/webapp</directory>
+                                <filtering>true</filtering>
+                            </resource>
+                        </webResources>
+                    </configuration>
+                </plugin>
                 <!--
                 NOTE: Using 2.3-SNAPSHOT for TestNG w/JDK 1.5 support.
                 -->
@@ -110,7 +126,6 @@
                                 <skip>true</skip>
                             </configuration>
                         </execution>
-
                         <execution>
                             <id>integration</id>
                             <phase>integration-test</phase>
@@ -124,7 +139,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
                 <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>maven-maven-plugin</artifactId>
@@ -146,7 +160,6 @@
                                 <goal>invoke</goal>
                             </goals>
                         </execution>
-
                         <execution>
                             <id>site-deploy</id>
                             <phase>site-deploy</phase>
@@ -162,7 +175,6 @@
                                 </parameters>
                             </configuration>
                         </execution>
-
                         <execution>
                             <id>clean</id>
                             <phase>clean</phase>
@@ -177,7 +189,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
                 <plugin>
                     <groupId>org.apache.geronimo.plugins</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
@@ -189,7 +200,6 @@
                         </reporters>
                     </configuration>
                 </plugin>
-
                 <plugin>
                     <groupId>org.apache.geronimo.plugins</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
@@ -207,10 +217,8 @@
                         </execution>
                     </executions>
                 </plugin>
-
             </plugins>
         </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -222,21 +230,18 @@
             </plugin>
         </plugins>
     </build>
-
     <distributionManagement>
         <site>
             <id>website</id>
             <url>scp://people.apache.org/www/geronimo.apache.org/maven/server/testsuite/${buildNumber}</url>
         </site>
     </distributionManagement>
-
     <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
             </plugin>
-
             <!-- This should actually be configured in genesis:project-config -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -248,19 +253,16 @@
             </plugin>
         </plugins>
     </reporting>
-
     <profiles>
         <profile>
             <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-
             <build>
                 <pluginManagement>
                     <plugins>
                         
-
                         <plugin>
                             <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>geronimo-maven-plugin</artifactId>
@@ -276,7 +278,6 @@
                                         <background>true</background>
                                     </configuration>
                                 </execution>
-
                                 <!-- Stopping server and restarting it after every testsuite seems to be an overkill.
                                 <execution>
                                     <id>stop-server</id>
@@ -291,7 +292,6 @@
                         </plugin>
                     </plugins>
                 </pluginManagement>
-
                 <plugins>
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
@@ -308,13 +308,10 @@
                         </executions>
                     </plugin>
                 </plugins>
-
             </build>
         </profile>
-
         <profile>
             <id>child</id>
         </profile>
     </profiles>
-
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Tue Jan 30 19:48:48 2007
@@ -67,18 +67,6 @@
                     <extensions>true</extensions>
                   </plugin>
 
-                    <!--
-                     FIXME: Need to reset the default values here since our parent sets up wars
-                     for use with jspc.  Remove once parent pom has been fixed.
-                     -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
-                        </configuration>
-                    </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -111,7 +99,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>Samples/SampleJsp/2.0/car</moduleId>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 30 19:48:48 2007
@@ -18,9 +18,9 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>Samples</dep:groupId>
-      <dep:artifactId>SampleJsp</dep:artifactId>
-      <dep:version>2.0</dep:version>
+      <dep:groupId>${pom.groupId}</dep:groupId>
+      <dep:artifactId>${pom.artifactId}</dep:artifactId>
+      <dep:version>${version}</dep:version>
       <dep:type>car</dep:type>
     </dep:moduleId>
   </dep:environment>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/taglib.tld Tue Jan 30 19:48:48 2007
@@ -8,7 +8,7 @@
     <uri>/tlt</uri>
     <tag>
        <name>hello</name>
-       <tagclass>com.test.jsp.HelloTag</tagclass>
+       <tagclass>org.apache.geronimo.testsuite.jsps.HelloTag</tagclass>
        <bodycontent>empty</bodycontent>
     </tag>
 </taglib>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml Tue Jan 30 19:48:48 2007
@@ -61,18 +61,6 @@
                     <extensions>true</extensions>
                   </plugin>
 
-                    <!--
-                     FIXME: Need to reset the default values here since our parent sets up wars
-                     for use with jspc.  Remove once parent pom has been fixed.
-                     -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                        </configuration>
-                    </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -105,7 +93,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>Samples/SampleServlet/2.0/car</moduleId>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=501716&r1=501715&r2=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 30 19:48:48 2007
@@ -18,9 +18,9 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>Samples</dep:groupId>
-      <dep:artifactId>SampleServlet</dep:artifactId>
-      <dep:version>2.0</dep:version>
+      <dep:groupId>${pom.groupId}</dep:groupId>
+      <dep:artifactId>${pom.artifactId}</dep:artifactId>
+      <dep:version>${version}</dep:version>
       <dep:type>car</dep:type>
     </dep:moduleId>
   </dep:environment>

Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,93 @@
+<?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.
+-->
+<!-- $Rev$ $Date$ -->
+<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>
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>web-testsuite</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>test-jetty</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test Jetty</name>
+    <packaging>war</packaging>
+    
+    <description>
+        Tests for the test-deployables.
+        maven-maven-plugin:invoke executes the 'child' profile.
+        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+              <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <sys:environment>
+        <sys:moduleId>
+            <sys:groupId>${pom.groupId}</sys:groupId>
+            <sys:artifactId>${pom.artifactId}</sys:artifactId>
+            <sys:version>${version}</sys:version>
+            <sys:type>car</sys:type>
+        </sys:moduleId>
+    </sys:environment>
+    <context-root>/JettyWeb</context-root>
+    <web-container>
+        <gbean-link>JettyWebContainer</gbean-link>
+    </web-container>
+    <container-config>
+        <jetty xmlns="http://geronimo.apache.org/xml/ns/web/jetty/config-1.0">
+            <virtual-host>testhost.com</virtual-host>
+        </jetty>
+    </container-config>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 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">
+	<display-name>
+	JettyWeb</display-name>
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>default.html</welcome-file>
+		<welcome-file>default.htm</welcome-file>
+		<welcome-file>default.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html Tue Jan 30 19:48:48 2007
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Testing Jetty</title>
+</head>
+<body>
+Testing Jetty.
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java Tue Jan 30 19:48:48 2007
@@ -0,0 +1,36 @@
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.testsuite.jetty;
+
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
+
+public class TestJetty extends SeleniumTestSupport
+{
+    @Test
+    public void testJetty() throws Exception {
+        selenium.open("http://testhost.com:8080/JettyWeb/");
+        selenium.waitForPageToLoad("30000");
+        assertEquals("Testing Jetty.", selenium.getText("xpath=/html/body"));
+    }
+
+
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="5">
+    <test name="web-testsuite.jetty">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.jetty"/>
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,101 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>web-testsuite</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>test-security</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test Security</name>
+    <packaging>war</packaging>
+    
+
+    <description>
+        Tests for the test-deployables.
+        maven-maven-plugin:invoke executes the 'child' profile.
+        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+  xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
+  xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <sys:environment>
+        <sys:moduleId>
+            <sys:groupId>${pom.groupId}</sys:groupId>
+            <sys:artifactId>${pom.artifactId}</sys:artifactId>
+            <sys:version>${version}</sys:version>
+            <sys:type>war</sys:type>
+        </sys:moduleId>
+        <sys:dependencies>
+            <sys:dependency>
+                <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+                <sys:artifactId>j2ee-security</sys:artifactId>
+                <sys:type>car</sys:type>
+            </sys:dependency>
+        </sys:dependencies>
+        <sys:hidden-classes/>
+        <sys:non-overridable-classes/>
+    </sys:environment>
+    <context-root>/demo</context-root>
+    <security-realm-name>demo-properties-realm</security-realm-name>
+    <sec:security>
+        <sec:default-principal>
+            <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="izumi"/>
+        </sec:default-principal>
+        <sec:role-mappings>
+            <sec:role role-name="content-administrator">
+                <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="it" designated-run-as="true"/>
+                <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="metro"/>
+                <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="george"/>
+            </sec:role>
+        </sec:role-mappings>
+    </sec:security>
+    <gbean name="demo-properties-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <attribute name="realmName">demo-properties-realm</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="LoginService">
+            <name>JaasLoginService</name>
+        </reference>
+        <xml-reference name="LoginModuleConfiguration">
+            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
+                <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
+                    <log:login-domain-name>demo-properties-realm</log:login-domain-name>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
+                    <log:option name="usersURI">var/security/demo_users.properties</log:option>
+                    <log:option name="groupsURI">var/security/demo_groups.properties</log:option>
+                </log:login-module>
+            </log:login-config>
+        </xml-reference>
+    </gbean>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,66 @@
+<?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"
+         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"
+         version="2.4">
+
+    <!-- Welcome File List -->
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+<!-- [INSERT FRAGMENT HERE] --> 
+
+    <security-constraint>
+      <web-resource-collection>
+        <web-resource-name>Admin Role</web-resource-name>
+        <url-pattern>/protect/*</url-pattern>
+      </web-resource-collection>
+      <auth-constraint>
+        <role-name>content-administrator</role-name>
+      </auth-constraint>
+    </security-constraint>
+    
+    <security-constraint>
+      <web-resource-collection>
+        <web-resource-name>No Access</web-resource-name>
+        <url-pattern>/forbidden/*</url-pattern>
+      </web-resource-collection>
+      <auth-constraint/>
+    </security-constraint>
+
+    <login-config>
+      <auth-method>FORM</auth-method>
+      <realm-name>Jetty JAAS Realm</realm-name>
+      <form-login-config>
+         <form-login-page>/auth/logon.html?param=test</form-login-page>
+         <form-error-page>/auth/logonError.html?param=test</form-error-page>
+      </form-login-config>
+    </login-config>
+
+  <security-role>
+      <role-name>adminRef</role-name>
+  </security-role>
+
+  <security-role>
+      <role-name>content-administrator</role-name>
+  </security-role>
+
+</web-app>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html Tue Jan 30 19:48:48 2007
@@ -0,0 +1,36 @@
+<!--
+   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.
+-->
+<HTML>
+<H1>FORM Authentication demo</H1>
+<form method="POST" action="j_security_check">
+<table border="0" cellspacing="2" cellpadding="1">
+<tr>
+  <td>Username:</td>
+  <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+</tr>
+<tr>
+  <td>Password:</td>
+  <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+</tr>
+<tr>
+  <td colspan="2" align="center">
+    <input name="submit" type="submit" value="Login">
+  </td>
+</tr>
+</table>
+</form>
+</HTML>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logon.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html Tue Jan 30 19:48:48 2007
@@ -0,0 +1,21 @@
+<!--
+   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.
+-->
+<HTML>
+<H1>Authentication ERROR</H1>
+Username, password or role incorrect.
+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+</HTML>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/auth/logonError.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html Tue Jan 30 19:48:48 2007
@@ -0,0 +1,19 @@
+<!--
+   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.
+-->
+<html>
+hello world.
+</html>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/forbidden/hello.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html Tue Jan 30 19:48:48 2007
@@ -0,0 +1,19 @@
+<!--
+  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.
+-->
+<html>
+hello world.
+</html>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/main/webapp/protect/hello.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java Tue Jan 30 19:48:48 2007
@@ -0,0 +1,39 @@
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.testsuite.security;
+
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
+
+public class TestSecurity extends SeleniumTestSupport
+{
+    @Test
+    public void testSecurity() throws Exception {
+        selenium.open("/demo/protect/hello.html");
+        selenium.type("j_username", "system");
+		selenium.type("j_password", "manager");
+		selenium.click("submit");
+		selenium.waitForPageToLoad("30000");
+		assertEquals("hello world.", selenium.getText("xpath=/html"));
+    }
+
+
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="5">
+    <test name="web-testsuite.security">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.security"/>
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-security/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,101 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>web-testsuite</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>test-tomcat</artifactId>
+    <name>Geronimo TestSuite :: Web Testsuite :: Test Tomcat</name>
+    <packaging>war</packaging>
+    
+
+    <description>
+        Tests for the test-deployables.
+        maven-maven-plugin:invoke executes the 'child' profile.
+        Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=501716
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 30 19:48:48 2007
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <sys:environment>
+        <sys:moduleId>
+            <sys:groupId>${pom.groupId}</sys:groupId>
+            <sys:artifactId>${pom.artifactId}</sys:artifactId>
+            <sys:version>${version}</sys:version>
+            <sys:type>car</sys:type>
+        </sys:moduleId>
+    </sys:environment>
+    <context-root>/TomcatWeb</context-root>
+    <web-container>
+        <gbean-link>TomcatWebContainer</gbean-link>
+    </web-container>
+    <container-config>
+        <tomcat>
+            <host>testhost.com</host>
+            <valve-chain>FirstValve</valve-chain>
+            <tomcat-realm>TomcatRealm</tomcat-realm>
+        </tomcat>
+    </container-config>
+    <gbean name="NewVirtualHost"
+        class="org.apache.geronimo.tomcat.HostGBean">
+        <attribute name="className">
+			org.apache.catalina.core.StandardHost
+        </attribute>
+        <attribute name="initParams">
+			name=testhost.com
+			appBase=
+			workDir=work
+        </attribute>
+    </gbean>
+    <gbean name="FirstValve"
+        class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">
+			org.apache.catalina.authenticator.SingleSignOn
+        </attribute>
+        <reference name="NextValve">
+            <name>SecondValve</name>
+        </reference>
+    </gbean>
+    <gbean name="SecondValve"
+        class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">
+			org.apache.catalina.valves.AccessLogValve
+        </attribute>
+        <attribute name="initParams">
+			prefix=localhost_access_log. suffix=.txt pattern=common
+        </attribute>
+    </gbean>
+    <gbean name="TomcatRealm"
+        class="org.apache.geronimo.tomcat.RealmGBean">
+        <attribute name="className">
+			org.apache.geronimo.tomcat.realm.TomcatGeronimoRealm
+        </attribute>
+        <attribute name="initParams">
+			userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
+			roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
+        </attribute>
+    </gbean>
+</web-app>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message