geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaspi_1.0_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-jaspi</artifactId>
             <version>1.0-SNAPSHOT</version>

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 @@
     </description>
 
     <properties>
-        <jettyVersion>7.0.0.M2-SNAPSHOT</jettyVersion>
+        <jettyVersion>7.0.0.M3-SNAPSHOT</jettyVersion>
     </properties>
 
     <dependencyManagement>



Mime
View raw message