Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 90164 invoked from network); 6 Jan 2008 22:31:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jan 2008 22:31:32 -0000 Received: (qmail 78224 invoked by uid 500); 6 Jan 2008 22:31:21 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78216 invoked by uid 500); 6 Jan 2008 22:31:21 -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 78205 invoked by uid 99); 6 Jan 2008 22:31:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 14:31:21 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 22:31:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3F7581A9850; Sun, 6 Jan 2008 14:31:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609448 - in /geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6: JettyFilterMapping.java JettyPOJOWebServiceHolder.java JettyServletHolder.java ServletNameSource.java Date: Sun, 06 Jan 2008 22:31:10 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080106223111.3F7581A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Jan 6 14:31:09 2008 New Revision: 609448 URL: http://svn.apache.org/viewvc?rev=609448&view=rev Log: GERONIMO-3731 Provide common interface so filter mapping can get the servlet names Added: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java (with props) Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java?rev=609448&r1=609447&r2=609448&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java (original) +++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java Sun Jan 6 14:31:09 2008 @@ -40,7 +40,7 @@ private final boolean includeDispatch; private final boolean errorDispatch; private final JettyFilterHolder jettyFilterHolder; - private final Collection jettyServletHolders; + private final Collection jettyServletHolders; private final JettyFilterMapping previous; private final JettyServletRegistration jettyServletRegistration; @@ -63,7 +63,7 @@ boolean includeDispatch, boolean errorDispatch, JettyFilterHolder jettyFilterHolder, - Collection jettyServletHolders, + Collection jettyServletHolders, JettyFilterMapping previous, JettyServletRegistration jettyServletRegistration) { this.urlPatterns = urlPatterns; @@ -132,7 +132,7 @@ private void resetServlets() { String[] servletNames = new String[jettyServletHolders.size()]; int i = 0; - for (JettyServletHolder jettyServletHolder : jettyServletHolders) { + for (ServletNameSource jettyServletHolder : jettyServletHolders) { servletNames[i++] = jettyServletHolder.getServletName(); } setServletNames(servletNames); @@ -162,7 +162,7 @@ return jettyFilterHolder; } - public Collection getServlets() { + public Collection getServlets() { return jettyServletHolders; } Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java?rev=609448&r1=609447&r2=609448&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java (original) +++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java Sun Jan 6 14:31:09 2008 @@ -47,7 +47,7 @@ * * @version $Rev$ $Date$ */ -public class JettyPOJOWebServiceHolder implements GBeanLifecycle { +public class JettyPOJOWebServiceHolder implements ServletNameSource, GBeanLifecycle { private final ServletHolder servletHolder; private final WebServiceContainer webServiceContainer; private final Set servletMappings; Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java?rev=609448&r1=609447&r2=609448&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java (original) +++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java Sun Jan 6 14:31:09 2008 @@ -39,7 +39,7 @@ * @version $Rev$ $Date$ * @see JAASJettyRealm#isUserInRole(java.security.Principal, String) */ -public class JettyServletHolder implements Servlet, GBeanLifecycle { +public class JettyServletHolder implements ServletNameSource, Servlet, GBeanLifecycle { private final JettyServletRegistration servletRegistration; Added: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java?rev=609448&view=auto ============================================================================== --- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java (added) +++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java Sun Jan 6 14:31:09 2008 @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.apache.geronimo.jetty6; + +/** + * @version $Rev:$ $Date:$ + */ +public interface ServletNameSource { + String getServletName(); +} Propchange: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ServletNameSource.java ------------------------------------------------------------------------------ svn:mime-type = text/plain