pero 2004/10/05 00:56:50
Modified: catalina/src/share/org/apache/catalina/deploy
ContextEjb.java ContextLocalEjb.java
ContextResource.java ContextResourceEnvRef.java
ContextResourceLink.java
webapps/docs changelog.xml
Added: catalina/src/share/org/apache/catalina/deploy
ResourceBase.java
Log:
Refactor org.apache.catalina.deploy.ContextXXX to use new super class ResourceBase.
Revision Changes Path
1.7 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java
Index: ContextEjb.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextEjb.java 5 Oct 2004 06:57:20 -0000 1.6
+++ ContextEjb.java 5 Oct 2004 07:56:49 -0000 1.7
@@ -30,7 +30,7 @@
* @version $Revision$ $Date$
*/
-public class ContextEjb extends ContextBase implements Serializable {
+public class ContextEjb extends ResourceBase implements Serializable {
// ------------------------------------------------------------- Properties
1.7 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java
Index: ContextLocalEjb.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextLocalEjb.java 5 Oct 2004 06:57:20 -0000 1.6
+++ ContextLocalEjb.java 5 Oct 2004 07:56:49 -0000 1.7
@@ -30,7 +30,7 @@
* @version $Revision$ $Date$
*/
-public class ContextLocalEjb extends ContextBase implements Serializable {
+public class ContextLocalEjb extends ResourceBase implements Serializable {
// ------------------------------------------------------------- Properties
1.7 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextResource.java
Index: ContextResource.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextResource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextResource.java 5 Oct 2004 06:57:20 -0000 1.6
+++ ContextResource.java 5 Oct 2004 07:56:49 -0000 1.7
@@ -29,7 +29,7 @@
* @version $Revision$ $Date$
*/
-public class ContextResource extends ContextBase implements Serializable {
+public class ContextResource extends ResourceBase implements Serializable {
// ------------------------------------------------------------- Properties
1.3 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextResourceEnvRef.java
Index: ContextResourceEnvRef.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextResourceEnvRef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextResourceEnvRef.java 5 Oct 2004 06:57:20 -0000 1.2
+++ ContextResourceEnvRef.java 5 Oct 2004 07:56:49 -0000 1.3
@@ -29,7 +29,7 @@
* @version $Revision$ $Date$
*/
-public class ContextResourceEnvRef extends ContextBase implements Serializable {
+public class ContextResourceEnvRef extends ResourceBase implements Serializable {
// ------------------------------------------------------------- Properties
1.6 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java
Index: ContextResourceLink.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextResourceLink.java 5 Oct 2004 06:57:20 -0000 1.5
+++ ContextResourceLink.java 5 Oct 2004 07:56:49 -0000 1.6
@@ -30,7 +30,7 @@
* @version $Revision$ $Date$
*/
-public class ContextResourceLink extends ContextBase implements Serializable {
+public class ContextResourceLink extends ResourceBase implements Serializable {
// ------------------------------------------------------------- Properties
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/ResourceBase.java
Index: ResourceBase.java
===================================================================
/*
* Copyright 1999,2004 The Apache Software Foundation.
*
* Licensed 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.catalina.deploy;
import java.io.Serializable;
import java.util.Iterator;
import java.util.HashMap;
/**
* Representation of an Context element
*
* @author Peter Rossbach ([EMAIL PROTECTED])
* @version $Revision: 1.1 $ $Date: 2004/10/05 07:56:49 $
*/
public class ResourceBase implements Serializable {
// ------------------------------------------------------------- Properties
/**
* The description of this Context Element.
*/
private String description = null;
public String getDescription() {
return (this.description);
}
public void setDescription(String description) {
this.description = description;
}
/**
* The name of this context Element.
*/
private String name = null;
public String getName() {
return (this.name);
}
public void setName(String name) {
this.name = name;
}
/**
* The name of the EJB bean implementation class.
*/
private String type = null;
public String getType() {
return (this.type);
}
public void setType(String type) {
this.type = type;
}
/**
* Holder for our configured properties.
*/
private HashMap properties = new HashMap();
/**
* Return a configured property.
*/
public Object getProperty(String name) {
return properties.get(name);
}
/**
* Set a configured property.
*/
public void setProperty(String name, Object value) {
properties.put(name, value);
}
/**
* remove a configured property.
*/
public void removeProperty(String name) {
properties.remove(name);
}
/**
* List properties.
*/
public Iterator listProperties() {
return properties.keySet().iterator();
}
// -------------------------------------------------------- Package Methods
/**
* The NamingResources with which we are associated (if any).
*/
protected NamingResources resources = null;
public NamingResources getNamingResources() {
return (this.resources);
}
void setNamingResources(NamingResources resources) {
this.resources = resources;
}
}
1.133 +1 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- changelog.xml 5 Oct 2004 07:00:42 -0000 1.132
+++ changelog.xml 5 Oct 2004 07:56:49 -0000 1.133
@@ -126,7 +126,7 @@
Remove authenticator "debug" attributes from the descriptors. (remm)
</fix>
<update>
- Refactor org.apache.catalina.deploy.ContextXXX to use new super class
ContextBase. (pero)
+ Refactor org.apache.catalina.deploy.ContextXXX to use new super class
ResourceBase. (pero)
</update>
<fix>
Enable Connector.findLifecycleListener that we can listen start/stop
Connector events and save the listener to xml. (pero)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
