remm 01/05/13 21:07:32 Added: catalina/src/share/org/apache/catalina/core ApplicationContextFacade.java StandardWrapperFacade.java Log: - Add facade for the wrapper (servlet config). - Add facade for the application context (servlet context) Revision Changes Path 1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java Index: ApplicationContextFacade.java =================================================================== /* * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v 1.1 2001/05/14 04:07:31 remm Exp $ * $Revision: 1.1 $ * $Date: 2001/05/14 04:07:31 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * * [Additional notices, if required by prior licensing conditions] * */ package org.apache.catalina.core; import java.io.InputStream; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Set; import javax.naming.NamingException; import javax.naming.Binding; import javax.naming.directory.DirContext; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletContextAttributeEvent; import javax.servlet.ServletContextAttributeListener; import javax.servlet.http.HttpServletRequest; /** * Facade object which masks the internal <code>ApplicationContext</code> * object from the web application. * * @author Remy Maucherat * @version $Revision: 1.1 $ $Date: 2001/05/14 04:07:31 $ */ public final class ApplicationContextFacade implements ServletContext { // ----------------------------------------------------------- Constructors /** * Construct a new instance of this class, associated with the specified * Context instance. * * @param context The associated Context instance */ public ApplicationContextFacade(ApplicationContext context) { super(); this.context = (ServletContext) context; } /** * Construct a new instance of this class, associated with the specified * Context instance. * * @param context The associated Context instance */ public ApplicationContextFacade(ServletContext context) { super(); this.context = context; } // ----------------------------------------------------- Instance Variables /** * Wrapped application context. */ private ServletContext context = null; // ------------------------------------------------- ServletContext Methods public ServletContext getContext(String uripath) { // FIXME : Create a facade for the returned object ? return context.getContext(uripath); } public int getMajorVersion() { return context.getMajorVersion(); } public int getMinorVersion() { return context.getMinorVersion(); } public String getMimeType(String file) { return context.getMimeType(file); } public Set getResourcePaths(String path) { return context.getResourcePaths(path); } public URL getResource(String path) throws MalformedURLException { return context.getResource(path); } public InputStream getResourceAsStream(String path) { return context.getResourceAsStream(path); } public RequestDispatcher getRequestDispatcher(String path) { return context.getRequestDispatcher(path); } public RequestDispatcher getNamedDispatcher(String name) { return context.getNamedDispatcher(name); } public Servlet getServlet(String name) throws ServletException { return context.getServlet(name); } public Enumeration getServlets() { return context.getServlets(); } public Enumeration getServletNames() { return context.getServletNames(); } public void log(String msg) { context.log(msg); } public void log(Exception exception, String msg) { context.log(exception, msg); } public void log(String message, Throwable throwable) { context.log(message, throwable); } public String getRealPath(String path) { return context.getRealPath(path); } public String getServerInfo() { return context.getServerInfo(); } public String getInitParameter(String name) { return context.getInitParameter(name); } public Enumeration getInitParameterNames() { return context.getInitParameterNames(); } public Object getAttribute(String name) { return context.getAttribute(name); } public Enumeration getAttributeNames() { return context.getAttributeNames(); } public void setAttribute(String name, Object object) { context.setAttribute(name, object); } public void removeAttribute(String name) { context.removeAttribute(name); } public String getServletContextName() { return context.getServletContextName(); } } 1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperFacade.java Index: StandardWrapperFacade.java =================================================================== /* * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperFacade.java,v 1.1 2001/05/14 04:07:32 remm Exp $ * $Revision: 1.1 $ * $Date: 2001/05/14 04:07:32 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * * [Additional notices, if required by prior licensing conditions] * */ package org.apache.catalina.core; import java.io.File; import java.io.IOException; import java.net.URL; import java.util.Enumeration; import java.util.HashMap; import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.SingleThreadModel; import javax.servlet.UnavailableException; import javax.servlet.http.HttpServletResponse; /** * Facade for the <b>StandardWrapper</b> object. * * @author Remy Maucharat * @version $Revision: 1.1 $ $Date: 2001/05/14 04:07:32 $ */ public final class StandardWrapperFacade implements ServletConfig { // ----------------------------------------------------------- Constructors /** * Create a new facede around a StandardWrapper. */ public StandardWrapperFacade(StandardWrapper config) { super(); this.config = (ServletConfig) config; } // ----------------------------------------------------- Instance Variables /** * Wrapped config. */ private ServletConfig config = null; // -------------------------------------------------- ServletConfig Methods public String getServletName() { return config.getServletName(); } public ServletContext getServletContext() { return new ApplicationContextFacade(config.getServletContext()); } public String getInitParameter(String name) { return config.getInitParameter(name); } public Enumeration getInitParameterNames() { return config.getInitParameterNames(); } }