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/13 00:15:46 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy ContextEjb.java ContextEnvironment.java ContextResource.java
craigmcc 00/02/12 15:15:46
Modified: proposals/catalina/src/share/org/apache/tomcat Context.java
proposals/catalina/src/share/org/apache/tomcat/core
StandardContext.java
Added: proposals/catalina/src/share/org/apache/tomcat/deploy
ContextEjb.java ContextEnvironment.java
ContextResource.java
Log:
Move ContextEjb, ContextEnvironment, and ContextResource (objects that
represent data structures in the deployment descriptor) from package
org.apache.tomcat to package org.apache.tomcat.deploy to avoid clutter.
There will be several more such classes to represent the
<security-constraint> and <login-config> elements.
Revision Changes Path
1.4 +7 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Context.java 2000/02/12 23:08:54 1.3
+++ Context.java 2000/02/12 23:15:45 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Context.java,v 1.3 2000/02/12 23:08:54 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/02/12 23:08:54 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Context.java,v 1.4 2000/02/12 23:15:45 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/02/12 23:15:45 $
*
* ====================================================================
*
@@ -66,6 +66,9 @@
import javax.servlet.ServletContext;
+import org.apache.tomcat.deploy.ContextEjb;
+import org.apache.tomcat.deploy.ContextEnvironment;
+import org.apache.tomcat.deploy.ContextResource;
import org.apache.tomcat.deployment.WebApplicationDescriptor;
@@ -88,7 +91,7 @@
* deployment descriptor!</b>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/02/12 23:08:54 $
+ * @version $Revision: 1.4 $ $Date: 2000/02/12 23:15:45 $
*/
public interface Context extends Container {
1.6 +7 -7 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardContext.java 2000/02/12 23:08:54 1.5
+++ StandardContext.java 2000/02/12 23:15:45 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java,v 1.5 2000/02/12 23:08:54 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/02/12 23:08:54 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardContext.java,v 1.6 2000/02/12 23:15:45 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/02/12 23:15:45 $
*
* ====================================================================
*
@@ -74,12 +74,12 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tomcat.Container;
import org.apache.tomcat.Context;
-import org.apache.tomcat.ContextEjb;
-import org.apache.tomcat.ContextEnvironment;
-import org.apache.tomcat.ContextResource;
import org.apache.tomcat.Request;
import org.apache.tomcat.Response;
import org.apache.tomcat.Wrapper;
+import org.apache.tomcat.deploy.ContextEjb;
+import org.apache.tomcat.deploy.ContextEnvironment;
+import org.apache.tomcat.deploy.ContextResource;
import org.apache.tomcat.deployment.WebApplicationDescriptor;
@@ -89,7 +89,7 @@
* requests directed to a particular servlet.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/02/12 23:08:54 $
+ * @version $Revision: 1.6 $ $Date: 2000/02/12 23:15:45 $
*/
public final class StandardContext
1.1 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy/ContextEjb.java
Index: ContextEjb.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy/ContextEjb.java,v 1.1 2000/02/12 23:15:45 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/02/12 23:15:45 $
*
* ====================================================================
*
* 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.deploy;
/**
* 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/12 23:15:45 $
*/
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 ContextEjb(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/deploy/ContextEnvironment.java
Index: ContextEnvironment.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy/ContextEnvironment.java,v 1.1 2000/02/12 23:15:45 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/02/12 23:15:45 $
*
* ====================================================================
*
* 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.deploy;
/**
* 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/12 23:15:45 $
*/
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/deploy/ContextResource.java
Index: ContextResource.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy/ContextResource.java,v 1.1 2000/02/12 23:15:45 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2000/02/12 23:15:45 $
*
* ====================================================================
*
* 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.deploy;
/**
* 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/12 23:15:45 $
*/
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);
}
}