cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty JettyWebApplicationContext.java

[djencks]

djencks     2004/01/25 09:47:37

  Modified:    modules/jetty project.xml
               modules/jetty/src/java/org/apache/geronimo/jetty
                        JettyWebApplicationContext.java
  Log:
  upgrade Jetty to latest version on ibiblio
  
  Revision  Changes    Path
  1.7       +5 -3      incubator-geronimo/modules/jetty/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml       23 Jan 2004 19:58:17 -0000      1.6
  +++ project.xml       25 Jan 2004 17:47:37 -0000      1.7
  @@ -107,9 +107,11 @@
           </dependency>
   
           <dependency>
  -            <id>jetty</id>
  -            <version>SNAPSHOT</version>
  +            <groupId>jetty</groupId>
  +            <artifactId>org.mortbay.jetty</artifactId>
  +            <version>5.0.beta0</version>
               <properties>
  +                <package>true</package>
                   <runtime>true</runtime>
               </properties>
           </dependency>
  
  
  
  1.4       +7 -6      
incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationContext.java
  
  Index: JettyWebApplicationContext.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JettyWebApplicationContext.java   22 Jan 2004 02:46:27 -0000      1.3
  +++ JettyWebApplicationContext.java   25 Jan 2004 17:47:37 -0000      1.4
  @@ -62,6 +62,7 @@
   import java.util.WeakHashMap;
   import java.net.URI;
   import java.io.IOException;
  +
   import javax.resource.ResourceException;
   import javax.security.jacc.PolicyContext;
   import javax.transaction.RollbackException;
  @@ -123,10 +124,10 @@
           this.associator = associator;
       }
   
  -    public boolean handle(String pathInContext,
  -            String pathParams,
  -            HttpRequest httpRequest,
  -            HttpResponse httpResponse)
  +    public void handle(String pathInContext,
  +                       String pathParams,
  +                       HttpRequest httpRequest,
  +                       HttpResponse httpResponse)
               throws HttpException, IOException {
   
   
  @@ -172,7 +173,7 @@
                   }
               }
   
  -            return super.handle(pathInContext, pathParams, httpRequest, 
httpResponse);
  +            super.handle(pathInContext, pathParams, httpRequest, 
httpResponse);
           } finally {
               try {
                   if (txManager != null) {