You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/02/08 04:34:45 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core StandardWrapper.java
craigmcc 00/02/07 19:34:45
Modified: proposals/catalina/src/share/org/apache/tomcat Context.java
Wrapper.java
proposals/catalina/src/share/org/apache/tomcat/core
StandardWrapper.java
Added: proposals/catalina/src/share/org/apache/tomcat
ContextEjb.java ContextEnvironment.java
ContextResource.java
Log:
Continue migration towards totally external configuration for Context and
Wrapper. In the case of Context, this also requires some ancillary data
objects for configuration settings normally processed from "web.xml", to
avoid any core dependencies on the deployment descriptor data structures.
Revision Changes Path
1.2 +406 -3 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Context.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Context.java 2000/01/20 06:32:05 1.1
+++ Context.java 2000/02/08 03:34:44 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Context.java,v 1.1 2000/01/20 06:32:05 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/01/20 06:32:05 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Context.java,v 1.2 2000/02/08 03:34:44 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/02/08 03:34:44 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* deployment descriptor!</b>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/01/20 06:32:05 $
+ * @version $Revision: 1.2 $ $Date: 2000/02/08 03:34:44 $
*/
public interface Context extends Container {
@@ -112,6 +112,20 @@
/**
+ * Return the distributable flag for this web application.
+ */
+ public boolean getDistributable();
+
+
+ /**
+ * Set the distributable flag for this web application.
+ *
+ * @param distributable The new distributable flag
+ */
+ public void setDistributable(boolean distributable);
+
+
+ /**
* Return the context path for this web application.
*/
public String getPath();
@@ -131,10 +145,305 @@
public ServletContext getServletContext();
+ /**
+ * Return the default session timeout (in minutes) for this
+ * web application.
+ */
+ public int getSessionTimeout();
+
+
+ /**
+ * Set the default session timeout (in minutes) for this
+ * web application.
+ *
+ * @param timeout The new default session timeout
+ */
+ public void setSessionTimeout(int timeout);
+
+
// --------------------------------------------------------- Public Methods
/**
+ * Add an EJB resource reference for this web application.
+ *
+ * @param ejb New EJB resource reference
+ */
+ public void addEjb(ContextEjb ejb);
+
+
+ /**
+ * Add an environment entry for this web application.
+ *
+ * @param environment New environment entry
+ */
+ public void addEnvironment(ContextEnvironment environment);
+
+
+ /**
+ * Add an error page for the specified Java exception.
+ *
+ * @param exception Fully qualified exception class
+ * @param location Context-relative URI of the corresponding page
+ */
+ public void addExceptionPage(String exception, String location);
+
+
+ /**
+ * Add a new MIME mapping, replacing any existing mapping for
+ * the specified extension.
+ *
+ * @param extension Filename extension being mapped
+ * @param mimeType Corresponding MIME type
+ */
+ public void addMimeMapping(String extension, String mimeType);
+
+
+ /**
+ * Add a new context initialization parameter, replacing any existing
+ * value for the specified name.
+ *
+ * @param name Name of the new parameter
+ * @param value Value of the new parameter
+ */
+ public void addParameter(String name, String value);
+
+
+ /**
+ * Add a resource reference for this web application.
+ *
+ * @param resource New resource reference
+ */
+ public void addResource(ContextResource resource);
+
+
+ /**
+ * Add a new security role for this web application.
+ *
+ * @param role New security role
+ */
+ public void addSecurityRole(String role);
+
+
+ /**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
+ * @param pattern URL pattern to be mapped
+ * @param name Name of the corresponding servlet to execute
+ */
+ public void addServletMapping(String pattern, String name);
+
+
+ /**
+ * Add an error page for the specified HTTP status code.
+ *
+ * @param status HTTP status code to be mapped
+ * @param location Context-relative URI of the corresponding page
+ */
+ public void addStatusPage(int status, String location);
+
+
+ /**
+ * Add a JSP tag library for the specified URI.
+ *
+ * @param uri URI, relative to the web.xml file, of this tag library
+ * @param location Location of the tag library descriptor
+ */
+ public void addTaglib(String uri, String location);
+
+
+ /**
+ * Add a new welcome file to the set recognized by this Context.
+ *
+ * @param name New welcome file name
+ */
+ public void addWelcomeFile(String name);
+
+
+ /**
+ * Return the EJB resource reference with the specified name, if any;
+ * otherwise, return <code>null</code>.
+ *
+ * @param name Name of the desired EJB resource reference
+ */
+ public ContextEjb findEjb(String name);
+
+
+ /**
+ * Return the defined EJB resource references for this application.
+ * If there are none, a zero-length array is returned.
+ */
+ public ContextEjb[] findEjbs();
+
+
+ /**
+ * Return the environment entry with the specified name, if any;
+ * otherwise, return <code>null</code>.
+ *
+ * @param name Name of the desired environment entry
+ */
+ public ContextEnvironment findEnvironment(String name);
+
+
+ /**
+ * Return the set of defined environment entries for this web
+ * application. If none have been defined, a zero-length array
+ * is returned.
+ */
+ public ContextEnvironment[] findEnvironments();
+
+
+ /**
+ * Return the context-relative URI of the exception page for the
+ * specified Java language exception, if any; otherwise return
+ * <code>null</code>.
+ *
+ * @param exception Exception class to look up
+ */
+ public String findExceptionPage(String exception);
+
+
+ /**
+ * Return the set of Java language exceptions for which error pages
+ * have been specified. If none are specified, a zero-length array
+ * is returned.
+ */
+ public String[] findExceptionPages();
+
+
+ /**
+ * Return the MIME type to which the specified extension is mapped,
+ * if any; otherwise return <code>null</code>.
+ *
+ * @param extension Extension to map to a MIME type
+ */
+ public String findMimeMapping(String extension);
+
+
+ /**
+ * Return the extensions for which MIME mappings are defined. If there
+ * are none, a zero-length array is returned.
+ */
+ public String[] findMimeMappings();
+
+
+ /**
+ * Return the value for the specified context initialization
+ * parameter name, if any; otherwise return <code>null</code>.
+ *
+ * @param name Name of the parameter to return
+ */
+ public String findParameter(String name);
+
+
+ /**
+ * Return the names of all defined context initialization parameters
+ * for this Context. If no parameters are defined, a zero-length
+ * array is returned.
+ */
+ public String[] findParameters();
+
+
+ /**
+ * Return the resource reference with the specified name, if any;
+ * otherwise return <code>null</code>.
+ *
+ * @param name Name of the desired resource reference
+ */
+ public ContextResource findResource(String name);
+
+
+ /**
+ * Return the defined resource references for this application. If
+ * none have been defined, a zero-length array is returned.
+ */
+ public ContextResource[] findResources();
+
+
+ /**
+ * Return <code>true</code> if the specified security role is defined
+ * for this application; otherwise return <code>false</code>.
+ *
+ * @param role Security role to verify
+ */
+ public boolean findSecurityRole(String role);
+
+
+ /**
+ * Return the security roles defined for this application. If none
+ * have been defined, a zero-length array is returned.
+ */
+ public String[] findSecurityRoles();
+
+
+ /**
+ * Return the servlet name mapped by the specified pattern (if any);
+ * otherwise return <code>null</code>.
+ *
+ * @param pattern Pattern for which a mapping is requested
+ */
+ public String findServletMapping(String pattern);
+
+
+ /**
+ * Return the patterns of all defined servlet mappings for this
+ * Context. If no mappings are defined, a zero-length array is returned.
+ */
+ public String[] findServletMappings();
+
+
+ /**
+ * Return the context-relative URI of the error page for the specified
+ * HTTP status code, if any; otherwise return <code>null</code>.
+ *
+ * @param status HTTP status code to look up
+ */
+ public String findStatusPage(int status);
+
+
+ /**
+ * Return the set of HTTP status codes for which error pages have
+ * been specified. If none are specified, a zero-length array
+ * is returned.
+ */
+ public int[] findStatusPages();
+
+
+ /**
+ * Return the tag library descriptor location for the specified taglib
+ * URI, if any; otherwise, return <code>null</code>.
+ *
+ * @param uri URI, relative to the web.xml file
+ */
+ public String findTaglib(String uri);
+
+
+ /**
+ * Return the URIs of all tag libraries for which a tag library
+ * descriptor location has been specified. If none are specified,
+ * a zero-length array is returned.
+ */
+ public String[] findTaglibs();
+
+
+ /**
+ * Return <code>true</code> if the specified welcome file is defined
+ * for this Context; otherwise return <code>false</code>.
+ *
+ * @param name Welcome file to verify
+ */
+ public boolean findWelcomeFile(String name);
+
+
+ /**
+ * Return the set of welcome files defined for this Context. If none are
+ * defined, a zero-length array is returned.
+ */
+ public String[] findWelcomeFiles();
+
+
+ /**
* Return the Wrapper associated with the servlet that matches the
* specified context-relative URI, if any; otherwise return
* <code>null</code>.
@@ -142,6 +451,100 @@
* @param uri Context-relative URI, which must start with a "/"
*/
public Wrapper map(String uri);
+
+
+ /**
+ * Remove any EJB resource reference with the specified name.
+ *
+ * @param name Name of the EJB resource reference to remove
+ */
+ public void removeEjb(String name);
+
+
+ /**
+ * Remove any environment entry with the specified name.
+ *
+ * @param name Name of the environment entry to remove
+ */
+ public void removeEnvironment(String name);
+
+
+ /**
+ * Remove the error page for the specified Java language exception,
+ * if it exists; otherwise, no action is taken.
+ *
+ * @param exception Java language exception to remove
+ */
+ public void removeExceptionPage(String exception);
+
+
+ /**
+ * Remove the MIME mapping for the specified extension, if it exists;
+ * otherwise, no action is taken.
+ *
+ * @param extension Extension to remove the mapping for
+ */
+ public void removeMimeMapping(String extension);
+
+
+ /**
+ * Remove the context initialization parameter with the specified
+ * name, if it exists; otherwise, no action is taken.
+ *
+ * @param name Name of the parameter to remove
+ */
+ public void removeParameter(String name);
+
+
+ /**
+ * Remove any resource reference with the specified name.
+ *
+ * @param name Name of the resource reference to remove
+ */
+ public void removeResource(String name);
+
+
+ /**
+ * Remove any security role with the specified name.
+ *
+ * @param role Security role to remove
+ */
+ public void removeSecurityRole(String role);
+
+
+ /**
+ * Remove any servlet mapping for the specified pattern, if it exists;
+ * otherwise, no action is taken.
+ *
+ * @param pattern URL pattern of the mapping to remove
+ */
+ public void removeServletMapping(String pattern);
+
+
+ /**
+ * Remove the error page for the specified HTTP status code, if it
+ * exists; otherwise, no action is taken.
+ *
+ * @param status HTTP status code to remove
+ */
+ public void removeStatusPage(int status);
+
+
+ /**
+ * Remove the tag library location forthe specified tag library URI.
+ *
+ * @param uri URI, relative to the web.xml file
+ */
+ public void removeTaglib(String uri);
+
+
+ /**
+ * Remove the specified welcome file name from the list recognized
+ * by this Context.
+ *
+ * @param name Name of the welcome file to be removed
+ */
+ public void removeWelcomeFile(String name);
}
1.4 +6 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Wrapper.java
Index: Wrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Wrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Wrapper.java 2000/01/30 06:56:20 1.3
+++ Wrapper.java 2000/02/08 03:34:44 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Wrapper.java,v 1.3 2000/01/30 06:56:20 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/01/30 06:56:20 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Wrapper.java,v 1.4 2000/02/08 03:34:44 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/02/08 03:34:44 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* <code>IllegalArgumentException</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/01/30 06:56:20 $
+ * @version $Revision: 1.4 $ $Date: 2000/02/08 03:34:44 $
*/
public interface Wrapper extends Container {
@@ -203,7 +203,7 @@
* Return the names of all defined initialization parameters for this
* servlet.
*/
- public String[] findInitParameterNames();
+ public String[] findInitParameters();
/**
@@ -219,7 +219,7 @@
* Return the set of security role reference names associated with
* this servlet, if any; otherwise return a zero-length array.
*/
- public String[] findSecurityReferenceNames();
+ public String[] findSecurityReferences();
/**
1.1 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/ContextEjb.java
Index: ContextEjb.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/ContextEjb.java,v 1.1 2000/02/08 03:34:44 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/02/08 03:34:44 $
*
* ====================================================================
*
* 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 apache@apache.org.
*
* 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.tomcat;
/**
* Representation of an EJB resource reference for a web application, as
* represented in a <code><ejb-ref></code> element in the
* deployment descriptor.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2000/02/08 03:34:44 $
*/
public final class ContextEjb {
// ----------------------------------------------------------- Constructors
/**
* Construct a new EJB resource reference with the specified properties
*
* @param name EJB resource reference name
* @param description EJB resource reference description
* @param type Java class name of the EJB bean implementation class
* @param home Java class name of the EJB home implementation class
* @param remote Java class name of the EJB remote implementation class
* @param link Optional link to a J2EE EJB definition
*/
public ContextResource(String name, String description,
String type, String home,
String remote, String link)
super();
this.name = name;
this.description = description;
this.type = type;
this.home = home;
this.remote = remote;
this.link = link;
}
// ----------------------------------------------------- Instance Variables
private String description = null;
private String home = null;
private String link = null;
private String name = null;
private String remote = null;
private String type = null;
// ------------------------------------------------------------- Properties
public String getDescription() {
return (this.description);
}
public String getHome() {
return (this.home);
}
public String getLink() {
return (this.link);
}
public String getName() {
return (this.name);
}
public String getRemote() {
return (this.remote);
}
public String getType() {
return (this.type);
}
}
1.1 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/ContextEnvironment.java
Index: ContextEnvironment.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/ContextEnvironment.java,v 1.1 2000/02/08 03:34:44 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/02/08 03:34:44 $
*
* ====================================================================
*
* 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 apache@apache.org.
*
* 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.tomcat;
/**
* Representation of an application environment entry, as represented in
* an <code><env-entry></code> element in the deployment descriptor.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2000/02/08 03:34:44 $
*/
public final class ContextEnvironment {
// ----------------------------------------------------------- Constructors
/**
* Construct a new environment entry with the specified properties
*
* @param name Environment entry name
* @param description Environment entry description
* @param type Java class name of the implementation class
* @param value String representation of the entry value
*/
public ContextEnvironment(String name, String description,
String type, String value)
super();
this.name = name;
this.description = description;
this.type = type;
this.value = value;
}
// ----------------------------------------------------- Instance Variables
private String description = null;
private String name = null;
private String type = null;
private String value = null;
// ------------------------------------------------------------- Properties
public String getDescription() {
return (this.description);
}
public String getName() {
return (this.name);
}
public String getType() {
return (this.type);
}
public String getValue() {
return (this.value);
}
}
1.1 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/ContextResource.java
Index: ContextResource.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/ContextResource.java,v 1.1 2000/02/08 03:34:44 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/02/08 03:34:44 $
*
* ====================================================================
*
* 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 apache@apache.org.
*
* 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.tomcat;
/**
* Representation of a resource reference for a web application, as
* represented in a <code><resource-ref></code> element in the
* deployment descriptor.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2000/02/08 03:34:44 $
*/
public final class ContextResource {
// ----------------------------------------------------------- Constructors
/**
* Construct a new resource reference with the specified properties
*
* @param name Resource reference name
* @param description Resource reference description
* @param type Java class name of the implementation class
* @param auth Authorization requirement (SERVLET or CONTAINER)
*/
public ContextResource(String name, String description,
String type, String auth)
super();
this.name = name;
this.description = description;
this.type = type;
this.auth = auth;
}
// ----------------------------------------------------- Instance Variables
private String auth = null;
private String description = null;
private String name = null;
private String type = null;
// ------------------------------------------------------------- Properties
public String getAuth() {
return (this.auth);
}
public String getDescription() {
return (this.description);
}
public String getName() {
return (this.name);
}
public String getType() {
return (this.type);
}
}
1.3 +6 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardWrapper.java 2000/02/07 06:08:57 1.2
+++ StandardWrapper.java 2000/02/08 03:34:45 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java,v 1.2 2000/02/07 06:08:57 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/02/07 06:08:57 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java,v 1.3 2000/02/08 03:34:45 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/02/08 03:34:45 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/02/07 06:08:57 $
+ * @version $Revision: 1.3 $ $Date: 2000/02/08 03:34:45 $
*/
public final class StandardWrapper
@@ -448,7 +448,7 @@
* Return the names of all defined initialization parameters for this
* servlet.
*/
- public String[] findInitParameterNames() {
+ public String[] findInitParameters() {
synchronized (parameters) {
String results[] = new String[parameters.size()];
@@ -480,7 +480,7 @@
* Return the set of security role reference names associated with
* this servlet, if any; otherwise return a zero-length array.
*/
- public String[] findSecurityReferenceNames() {
+ public String[] findSecurityReferences() {
synchronized (references) {
String results[] = new String[references.size()];