You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/01/06 23:31:10 UTC
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
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<JettyServletHolder> jettyServletHolders;
+ private final Collection<ServletNameSource> jettyServletHolders;
private final JettyFilterMapping previous;
private final JettyServletRegistration jettyServletRegistration;
@@ -63,7 +63,7 @@
boolean includeDispatch,
boolean errorDispatch,
JettyFilterHolder jettyFilterHolder,
- Collection<JettyServletHolder> jettyServletHolders,
+ Collection<ServletNameSource> 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<JettyServletHolder> getServlets() {
+ public Collection<ServletNameSource> 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