geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r158395 - in geronimo/trunk: etc/ modules/jetty/ modules/jetty/src/java/org/apache/geronimo/jetty/ modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/
Date Mon, 21 Mar 2005 03:02:02 GMT
Author: jboynes
Date: Sun Mar 20 19:02:01 2005
New Revision: 158395

URL: http://svn.apache.org/viewcvs?view=rev&rev=158395
Log:
upgrade to Jetty 5.1.3RC2

Modified:
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/jetty/project.properties
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?view=diff&r1=158394&r2=158395
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sun Mar 20 19:02:01 2005
@@ -137,7 +137,7 @@
 jaxb_ri_version=SNAPSHOT
 jdbm_version=0.20-dev
 jelly_velocity_tags_version=SNAPSHOT
-jetty_version=5.1.2-SNAPSHOT
+jetty_version=5.1.3rc2
 jgroups_version=2.2.5
 jmock_version=1.0.1
 jrms_version=1.1

Modified: geronimo/trunk/modules/jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/project.properties?view=diff&r1=158394&r2=158395
==============================================================================
--- geronimo/trunk/modules/jetty/project.properties (original)
+++ geronimo/trunk/modules/jetty/project.properties Sun Mar 20 19:02:01 2005
@@ -4,7 +4,5 @@
 
 # the directory containing the geronimo website in CVS
 
-maven.repo.remote=http://www.apache.org/~jboynes, http://www.mortbay.org/maven, http://www.openejb.org/maven,
http://dist.codehaus.org, http://www.ibiblio.org/maven, http://www.apache.org/dist/java-repository/
-
 maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-resources/data/login.config
-ea
 maven.junit.fork=true

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java?view=diff&r1=158394&r2=158395
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
Sun Mar 20 19:02:01 2005
@@ -23,6 +23,7 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.mortbay.jetty.servlet.WebApplicationHandler;
 import org.mortbay.jetty.servlet.FilterHolder;
+import org.mortbay.jetty.servlet.Dispatcher;
 
 /**
  * @version $Rev:  $ $Date:  $
@@ -77,16 +78,16 @@
             String filterName = jettyFilterHolder.getFilterName();
             int dispatches = 0;
             if (requestDispatch) {
-                dispatches |= FilterHolder.__REQUEST;
+                dispatches |= Dispatcher.__REQUEST;
             }
             if (forwardDispatch) {
-                dispatches |= FilterHolder.__FORWARD;
+                dispatches |= Dispatcher.__FORWARD;
             }
             if (includeDispatch) {
-                dispatches |= FilterHolder.__INCLUDE;
+                dispatches |= Dispatcher.__INCLUDE;
             }
             if (errorDispatch) {
-                dispatches |= FilterHolder.__ERROR;
+                dispatches |= Dispatcher.__ERROR;
             }
 
 

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?view=diff&r1=158394&r2=158395
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
Sun Mar 20 19:02:01 2005
@@ -38,12 +38,7 @@
 import org.mortbay.http.HttpRequest;
 import org.mortbay.http.HttpResponse;
 import org.mortbay.http.HttpException;
-import org.mortbay.jetty.servlet.AbstractSessionManager;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.jetty.servlet.JSR154Filter;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.WebApplicationContext;
-import org.mortbay.jetty.servlet.WebApplicationHandler;
+import org.mortbay.jetty.servlet.*;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -254,7 +249,7 @@
         FilterHolder jsr154FilterHolder = new FilterHolder(handler, "jsr154", JSR154Filter.class.getName());
         handler.addFilterHolder(jsr154FilterHolder);
         jsr154FilterHolder.setInitParameter("unwrappedDispatch", "true");
-        handler.addFilterPathMapping("/*", "jsr154", JettyFilterHolder.__REQUEST | JettyFilterHolder.__FORWARD
| JettyFilterHolder.__INCLUDE | JettyFilterHolder.__ERROR );
+        handler.addFilterPathMapping("/*", "jsr154", Dispatcher.__REQUEST | Dispatcher.__FORWARD
| Dispatcher.__INCLUDE | Dispatcher.__ERROR );
     }
 
     public Object enterContextScope(HttpRequest httpRequest, HttpResponse httpResponse) {

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java?view=diff&r1=158394&r2=158395
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
Sun Mar 20 19:02:01 2005
@@ -39,14 +39,6 @@
         requestLog = new org.mortbay.http.NCSARequestLog();
     }
 
-    public boolean isBuffered() {
-        return requestLog.isBuffered();
-    }
-
-    public void setBuffered(boolean buffered) {
-        requestLog.setBuffered(buffered);
-    }
-
     public void setFilename(String filename) {
         this.filename = filename;
     }
@@ -141,8 +133,7 @@
         infoFactory.addAttribute("retainDays", int.class, true);
         infoFactory.addAttribute("extended", boolean.class, true);
         infoFactory.addAttribute("append", boolean.class, true);
-        infoFactory.addAttribute("buffered", boolean.class, true);
-        infoFactory.addAttribute("ingorePaths", String[].class, true);
+        infoFactory.addAttribute("ignorePaths", String[].class, true);
         infoFactory.addAttribute("preferProxiedForAddress", boolean.class, true);
 
         infoFactory.setConstructor(new String[]{"JettyContainer", "ServerInfo"});



Mime
View raw message