geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r891059 - in /geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8: GeronimoServletHolder.java handler/InjectionServletHandler.java
Date Tue, 15 Dec 2009 22:54:18 GMT
Author: djencks
Date: Tue Dec 15 22:54:17 2009
New Revision: 891059

URL: http://svn.apache.org/viewvc?rev=891059&view=rev
Log:
fix compilation erros against latest jetty source

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/GeronimoServletHolder.java
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/InjectionServletHandler.java

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/GeronimoServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/GeronimoServletHolder.java?rev=891059&r1=891058&r2=891059&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/GeronimoServletHolder.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/GeronimoServletHolder.java
Tue Dec 15 22:54:17 2009
@@ -18,20 +18,10 @@
 
 package org.apache.geronimo.jetty8;
 
-import java.io.IOException;
-
-import javax.security.auth.Subject;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.Servlet;
-
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext;
 import org.apache.geronimo.jetty8.handler.IntegrationContext;
-import org.apache.geronimo.security.Callers;
-import org.apache.geronimo.security.ContextManager;
-import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.servlet.ServletHolder;
 
 /**
@@ -51,8 +41,8 @@
         }
     }
 
-    public synchronized Object newInstance() throws InstantiationException, IllegalAccessException
{
-        return servletRegistration.newInstance(_className);
+    public synchronized Servlet newInstance() throws InstantiationException, IllegalAccessException
{
+        return (Servlet) servletRegistration.newInstance(_className);
     }
 
     public void destroyInstance(Object o) throws Exception {

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/InjectionServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/InjectionServletHandler.java?rev=891059&r1=891058&r2=891059&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/InjectionServletHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/InjectionServletHandler.java
Tue Dec 15 22:54:17 2009
@@ -44,17 +44,17 @@
         this.injections = injections;
     }
 
-    public Servlet customizeServlet(Servlet servlet) throws Exception {
-        List<Injection> classInjections = injections.get(servlet.getClass().getName());
-        if (classInjections != null) {
-            for (Injection injection: classInjections) {
-                
-            }
-        }
-        servlet = super.customizeServlet(servlet);
-        processAnnotations(servlet);
-        return servlet;
-    }
+//    public Servlet customizeServlet(Servlet servlet) throws Exception {
+//        List<Injection> classInjections = injections.get(servlet.getClass().getName());
+//        if (classInjections != null) {
+//            for (Injection injection: classInjections) {
+//
+//            }
+//        }
+//        servlet = super.customizeServlet(servlet);
+//        processAnnotations(servlet);
+//        return servlet;
+//    }
 
     /**
      * Inject resources in specified instance.



Mime
View raw message