Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 35222 invoked from network); 25 Nov 2007 18:08:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2007 18:08:46 -0000 Received: (qmail 37044 invoked by uid 500); 25 Nov 2007 18:08:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 36983 invoked by uid 500); 25 Nov 2007 18:08:33 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 36972 invoked by uid 99); 25 Nov 2007 18:08:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Nov 2007 10:08:33 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Nov 2007 18:08:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E9CEB1A9832; Sun, 25 Nov 2007 10:08:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r598023 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-javaee5/src/main/resources/cluster-repository/ assemblies/geronimo-jetty6-javaee5/src/main/resources/master-repository/ assemblies/geronimo-jetty6-javaee5/src/main/resources/va... Date: Sun, 25 Nov 2007 18:08:19 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071125180820.E9CEB1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Nov 25 10:08:16 2007 New Revision: 598023 URL: http://svn.apache.org/viewvc?rev=598023&view=rev Log: GERONIMO-3630 cleanup. Use copy-file to install base tomcat goo and cluster repo stuff Added: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/ - copied from r597942, geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/ Removed: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/cluster-repository/ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/master-repository/ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/ Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Sun Nov 25 10:08:16 2007 @@ -98,11 +98,6 @@ juli-adapters - - - - - @@ -113,29 +108,6 @@ pertest - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-test-resources - - run - - - - - - - - - - - - - - Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Sun Nov 25 10:08:16 2007 @@ -107,8 +107,8 @@ ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap, null, roleDesignates, cl, credentialStore, roleMapper); jacc.doStart(); - URL configurationBaseURL = new File(BASEDIR, "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL(); - return setUpInsecureAppContext(new File(BASEDIR, "target/var/catalina/webapps/war3/").toURI(), + URL configurationBaseURL = new File(BASEDIR, "src/test/resources/deployables/war3/WEB-INF/web.xml").toURL(); + return setUpInsecureAppContext(new File(BASEDIR, "src/test/resources/deployables/war3/").toURI(), configurationBaseURL, securityHolder, jacc, Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java Sun Nov 25 10:08:16 2007 @@ -30,8 +30,8 @@ private File basedir = new File(System.getProperty("basedir")); public void testApplication() throws Exception { - setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war1/").toURI(), - new File(basedir, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(), + setUpInsecureAppContext(new File(basedir, "src/test/resources/deployables/war1/").toURI(), + new File(basedir, "src/test/resources/deployables/war1/WEB-INF/web.xml").toURL(), null, null, null, Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java Sun Nov 25 10:08:16 2007 @@ -35,8 +35,8 @@ public void testStats() throws Exception { TomcatWebAppContext webModule; - webModule = setUpInsecureAppContext(new File(BASEDIR, "target/var/catalina/webapps/war1/").toURI(), new File( - BASEDIR, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(), null, null, null, null); + webModule = setUpInsecureAppContext(new File(BASEDIR, "src/test/resources/deployables/war1/").toURI(), new File( + BASEDIR, "src/test/resources/deployables/war1/WEB-INF/web.xml").toURL(), null, null, null, null); HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/hello.txt") .openConnection(); BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml Sun Nov 25 10:08:16 2007 @@ -21,6 +21,23 @@ Test Web Deployment + + default + org.apache.catalina.servlets.DefaultServlet + + debug + 0 + + + listings + false + + 1 + + + default + / + fake-resource-env-ref javax.jms.Queue Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml Sun Nov 25 10:08:16 2007 @@ -23,6 +23,23 @@ Test Web Deployment + + default + org.apache.catalina.servlets.DefaultServlet + + debug + 0 + + + listings + false + + 1 + + + default + / + fake-resource-env-ref javax.jms.Queue Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original) +++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Sun Nov 25 10:08:16 2007 @@ -130,6 +130,7 @@ Tomcat + tomcat-base/ - ${ServerHostname} ${HTTPPort + PortOffset} Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml?rev=598023&r1=598022&r2=598023&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml Sun Nov 25 10:08:16 2007 @@ -26,15 +26,6 @@ - - - META-INF/geronimo-tomcat6 - var/catalina - - ServerInfo - - - @@ -144,9 +135,6 @@ MBeanServerReference - - TomcatResources -