Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 93334 invoked from network); 15 Dec 2009 22:54:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Dec 2009 22:54:42 -0000 Received: (qmail 62469 invoked by uid 500); 15 Dec 2009 22:54:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 62413 invoked by uid 500); 15 Dec 2009 22:54:41 -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 62404 invoked by uid 99); 15 Dec 2009 22:54:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2009 22:54:41 +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; Tue, 15 Dec 2009 22:54:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6D22923888FD; Tue, 15 Dec 2009 22:54:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091215225418.6D22923888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 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.