Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72834 invoked from network); 14 Jun 2009 07:30:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jun 2009 07:30:03 -0000 Received: (qmail 60749 invoked by uid 500); 14 Jun 2009 07:30:14 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 60673 invoked by uid 500); 14 Jun 2009 07:30:14 -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 60664 invoked by uid 99); 14 Jun 2009 07:30:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2009 07:30:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2009 07:30:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6215B2388897; Sun, 14 Jun 2009 07:29:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r784517 - in /geronimo/server/trunk/plugins/jetty7: geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java jetty7/pom.xml pom.xml Date: Sun, 14 Jun 2009 07:29:52 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090614072952.6215B2388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Jun 14 07:29:51 2009 New Revision: 784517 URL: http://svn.apache.org/viewvc?rev=784517&view=rev Log: GERONIMO-4249 upgrade to current jetty snapshot, fix spec dependency, fix a problem with the wweb app not knowing where it is Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml geronimo/server/trunk/plugins/jetty7/pom.xml Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java?rev=784517&r1=784516&r2=784517&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java (original) +++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java Sun Jun 14 07:29:51 2009 @@ -92,7 +92,7 @@ private final ClassLoader webClassLoader; private final JettyContainer jettyContainer; - private final String webAppRoot; +// private final String webAppRoot; private final URL configurationBaseURL; private String displayName; @@ -242,7 +242,9 @@ //DONT install the jetty TLD configuration as we find and create all the listeners ourselves webAppContext.setConfigurationClasses(new String[]{}); - webAppRoot = configurationBaseUrl.toString(); + String webAppRoot = configurationBaseUrl.toString(); + webAppContext.setResourceBase(webAppRoot); + webAppContext.setWar(webAppRoot); webClassLoader = classLoader; webAppContext.setClassLoader(webClassLoader); @@ -344,7 +346,7 @@ public void doStart() throws Exception { // reset the classsloader... jetty likes to set it to null when stopping this.webAppContext.setClassLoader(webClassLoader); - this.webAppContext.setWar(webAppRoot); +// this.webAppContext.setWar(webAppRoot); getLifecycleChain().lifecycleCommand(new StartCommand()); } Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java?rev=784517&r1=784516&r2=784517&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java (original) +++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java Sun Jun 14 07:29:51 2009 @@ -51,8 +51,8 @@ for (int k = 0; k < n; k++) { HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl() + "/test/hello.txt") .openConnection(); - BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode()); + BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); assertEquals("Hello World", reader.readLine()); Stats stats = component.getStats(); Modified: geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml?rev=784517&r1=784516&r2=784517&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml (original) +++ geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml Sun Jun 14 07:29:51 2009 @@ -112,11 +112,6 @@ - org.apache.geronimo.specs - geronimo-jaspi_1.0_spec - 1.0-SNAPSHOT - - org.apache.geronimo.components geronimo-jaspi 1.0-SNAPSHOT Modified: geronimo/server/trunk/plugins/jetty7/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/pom.xml?rev=784517&r1=784516&r2=784517&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty7/pom.xml (original) +++ geronimo/server/trunk/plugins/jetty7/pom.xml Sun Jun 14 07:29:51 2009 @@ -37,7 +37,7 @@ - 7.0.0.M2-SNAPSHOT + 7.0.0.M3-SNAPSHOT