Author: remy.maucherat(a)jboss.com Date: 2009-02-13 22:44:44 -0500 (Fri, 13 Feb 2009) New Revision: 932 Modified: trunk/java/org/apache/catalina/core/ApplicationContextFacade.java trunk/java/org/apache/catalina/core/StandardWrapperFacade.java trunk/java/org/apache/catalina/startup/ContextConfig.java Log: - Try ServletRegistration. Modified: trunk/java/org/apache/catalina/core/ApplicationContextFacade.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 2009-02-13 17:27:21 UTC (rev 931) +++ trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 2009-02-14 03:44:44 UTC (rev 932) @@ -30,10 +30,8 @@ import java.util.EnumSet; import java.util.Enumeration; import java.util.HashMap; -import java.util.Map; import java.util.Set; -import javax.servlet.DispatcherType; import javax.servlet.FilterRegistration; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; Modified: trunk/java/org/apache/catalina/core/StandardWrapperFacade.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapperFacade.java 2009-02-13 17:27:21 UTC (rev 931) +++ trunk/java/org/apache/catalina/core/StandardWrapperFacade.java 2009-02-14 03:44:44 UTC (rev 932) @@ -20,9 +20,11 @@ import java.util.Enumeration; +import java.util.Map; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; +import javax.servlet.ServletRegistration; /** @@ -33,6 +35,7 @@ */ public final class StandardWrapperFacade + extends ServletRegistration implements ServletConfig { @@ -42,10 +45,10 @@ /** * Create a new facede around a StandardWrapper. */ - public StandardWrapperFacade(StandardWrapper config) { + public StandardWrapperFacade(StandardWrapper wrapper) { super(); - this.config = (ServletConfig) config; + this.wrapper = wrapper; } @@ -56,7 +59,7 @@ /** * Wrapped config. */ - private ServletConfig config = null; + private StandardWrapper wrapper = null; /** @@ -69,13 +72,13 @@ public String getServletName() { - return config.getServletName(); + return wrapper.getServletName(); } public ServletContext getServletContext() { if (context == null) { - context = config.getServletContext(); + context = wrapper.getServletContext(); if ((context != null) && (context instanceof ApplicationContext)) context = ((ApplicationContext) context).getFacade(); } @@ -84,13 +87,55 @@ public String getInitParameter(String name) { - return config.getInitParameter(name); + return wrapper.getInitParameter(name); } public Enumeration getInitParameterNames() { - return config.getInitParameterNames(); + return wrapper.getInitParameterNames(); } + @Override + public void addMapping(String... urlPatterns) { + // TODO Auto-generated method stub + + } + + + @Override + public void setAsyncSupported(boolean asyncSupported) { + // TODO Auto-generated method stub + super.setAsyncSupported(asyncSupported); + } + + + @Override + public void setDescription(String description) { + // TODO Auto-generated method stub + super.setDescription(description); + } + + + @Override + public void setInitParameter(String name, String value) { + // TODO Auto-generated method stub + + } + + + @Override + public void setInitParameters(Map<String, String> initParameters) { + // TODO Auto-generated method stub + + } + + + @Override + public void setLoadOnStartup(int loadOnStartup) { + // TODO Auto-generated method stub + super.setLoadOnStartup(loadOnStartup); + } + + } Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-02-13 17:27:21 UTC (rev 931) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-02-14 03:44:44 UTC (rev 932) @@ -1098,6 +1098,7 @@ } // Process the default and application web.xml files + // FIXME: Processing of web fragments defaultWebConfig(); applicationWebConfig(); if (!context.getIgnoreAnnotations()) {