cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardDefaultContext.java
yoavs 2004/05/26 08:36:35
Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.15 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardDefaultContext.java 15 Apr 2004 01:44:09 - 1.14
+++ StandardDefaultContext.java 26 May 2004 15:36:35 - 1.15
@@ -541,7 +541,7 @@
* Get the resources DirContext object with which this Container is
* associated.
*
- * @param resources The new associated DirContext
+ * @return The associated DirContext
*/
public DirContext getResources() {
@@ -821,7 +821,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink) {
@@ -1244,7 +1244,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
@@ -1286,7 +1286,7 @@
/**
* Remove any resource link with the specified name.
*
- * @param resourceName Name of the resource reference to remove
+ * @param resourceLinkName Name of the resource reference to remove
*/
public void removeResourceLink(String resourceLinkName) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardDefaultContext.java
Since I recently made changes to the DefaultContext in Tomcat 4, perhaps
this could be back ported to Tomcat 4.1.
Regards,
Glenn
[EMAIL PROTECTED] wrote:
remm2003/10/24 04:57:27
Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
- Add support for resource links to StdDefContext.
Revision ChangesPath
1.8 +16 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardDefaultContext.java 21 Oct 2003 00:18:25 - 1.7
+++ StandardDefaultContext.java 24 Oct 2003 11:57:27 - 1.8
@@ -1373,6 +1373,14 @@
}
listener.addResource(contextEntry);
}
+ContextResourceLink [] resourceLinks = findResourceLinks();
+for (int i = 0; i resourceLinks.length; i++) {
+ContextResourceLink contextEntry = resourceLinks[i];
+if (contextResources.exists(contextEntry.getName())) {
+listener.removeResourceLink(contextEntry.getName());
+}
+listener.addResourceLink(contextEntry);
+}
String [] envRefs = findResourceEnvRefs();
for (int i = 0; i envRefs.length; i++) {
if (contextResources.exists(envRefs[i])) {
@@ -1498,6 +1506,10 @@
ContextResource [] resources = findResources();
for( int i = 0; i resources.length; i++ ) {
context.addResource(resources[i]);
+}
+ContextResourceLink [] resourceLinks = findResourceLinks();
+for( int i = 0; i resourceLinks.length; i++ ) {
+context.addResourceLink(resourceLinks[i]);
}
String [] envRefs = findResourceEnvRefs();
for( int i = 0; i envRefs.length; i++ ) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardDefaultContext.java
remm2003/10/24 04:57:27
Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
- Add support for resource links to StdDefContext.
Revision ChangesPath
1.8 +16 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardDefaultContext.java 21 Oct 2003 00:18:25 - 1.7
+++ StandardDefaultContext.java 24 Oct 2003 11:57:27 - 1.8
@@ -1373,6 +1373,14 @@
}
listener.addResource(contextEntry);
}
+ContextResourceLink [] resourceLinks = findResourceLinks();
+for (int i = 0; i resourceLinks.length; i++) {
+ContextResourceLink contextEntry = resourceLinks[i];
+if (contextResources.exists(contextEntry.getName())) {
+listener.removeResourceLink(contextEntry.getName());
+}
+listener.addResourceLink(contextEntry);
+}
String [] envRefs = findResourceEnvRefs();
for (int i = 0; i envRefs.length; i++) {
if (contextResources.exists(envRefs[i])) {
@@ -1498,6 +1506,10 @@
ContextResource [] resources = findResources();
for( int i = 0; i resources.length; i++ ) {
context.addResource(resources[i]);
+}
+ContextResourceLink [] resourceLinks = findResourceLinks();
+for( int i = 0; i resourceLinks.length; i++ ) {
+context.addResourceLink(resourceLinks[i]);
}
String [] envRefs = findResourceEnvRefs();
for( int i = 0; i envRefs.length; i++ ) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardDefaultContext.java
costin 2003/03/16 23:28:51
Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
- merged the code implementing JMX operations from mbeans ( it was almost the same,
but with extra checks )
- started to add the jmx registration code - but I'm not sure how it should
behave. For now it'll not be used.
- optimize imports
Revision ChangesPath
1.5 +286 -40
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardDefaultContext.java 8 Dec 2002 13:42:09 - 1.4
+++ StandardDefaultContext.java 17 Mar 2003 07:28:51 - 1.5
@@ -66,24 +66,23 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.util.Enumeration;
+import java.net.URLDecoder;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
+import javax.management.MBeanRegistration;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import javax.naming.directory.DirContext;
-import org.apache.naming.ContextAccessController;
import org.apache.catalina.Container;
-import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
-import org.apache.catalina.InstanceListener;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
-import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ApplicationParameter;
import org.apache.catalina.deploy.ContextEjb;
import org.apache.catalina.deploy.ContextEnvironment;
@@ -91,7 +90,11 @@
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.ResourceParams;
+import org.apache.catalina.mbeans.MBeanUtils;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.Registry;
+import org.apache.naming.ContextAccessController;
/**
* Used to store the default configuration a Host will use
@@ -104,7 +107,7 @@
*/
public class StandardDefaultContext
-implements DefaultContext, LifecycleListener {
+implements DefaultContext, LifecycleListener, MBeanRegistration {
// --- Constructors
@@ -1059,18 +1062,6 @@
/**
- * Remove any environment entry with the specified name.
- *
- * @param name Name of the environment entry to remove
- */
-public void removeEnvironment(String name) {
-
-namingResources.removeEnvironment(name);
-
-}
-
-
-/**
* Remove a class name from the set of InstanceListener classes that
* will be added to newly created Wrappers.
*
@@ -1130,45 +1121,82 @@
support.removePropertyChangeListener(listener);
}
-
-
+
/**
- * Remove any resource reference with the specified name.
+ * Remove any environment entry with the specified name.
*
- * @param name Name of the resource reference to remove
+ * @param name Name of the environment entry to remove
*/
-public void removeResource(String name) {
-
-namingResources.removeResource(name);
+public void removeEnvironment(String envName) {
+NamingResources nresources = getNamingResources();
+if (nresources == null) {
+return;
+}
+ContextEnvironment env = nresources.findEnvironment(envName);
+if (env == null) {
+throw new IllegalArgumentException
+(Invalid environment name ' + envName + ');
+}
+nresources.removeEnvironment(envName);
}
/**
- * Remove any resource environment reference with the specified name.
+ * Remove any resource reference with the specified name.
*
- * @param name Name of the resource environment reference to remove
+ * @param resourceName Name of the resource reference to remove
*/
-public void removeResourceEnvRef(String name) {
-
-namingResources.removeResourceEnvRef(name);
+public void
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardDefaultContext.java
remm2002/11/13 06:35:55
Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
- Port patch.
- Reload is the equivalent of stop/start for naming purposes.
- Fixes bug 13364, while still doing a refresh of the naming context (which is
needed as it might contain instances loaded by the old classloader).
Revision ChangesPath
1.3 +22 -16
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardDefaultContext.java 20 Sep 2002 21:22:31 - 1.2
+++ StandardDefaultContext.java 13 Nov 2002 14:35:55 - 1.3
-1240,7 +1240,24
return;
}
-if (event.getType().equals(Lifecycle.AFTER_START_EVENT)) {
+if ((event.getType().equals(Lifecycle.BEFORE_STOP_EVENT))
+|| (event.getType().equals(Context.RELOAD_EVENT))) {
+
+// Remove context
+contexts.remove(context);
+
+// Remove listener from the NamingResource listener list
+namingResources.removePropertyChangeListener(listener);
+
+// Remove listener from lifecycle listeners
+if (!(event.getType().equals(Context.RELOAD_EVENT))) {
+context.removeLifecycleListener(this);
+}
+
+}
+
+if ((event.getType().equals(Lifecycle.AFTER_START_EVENT))
+|| (event.getType().equals(Context.RELOAD_EVENT))) {
// Add context
contexts.put(context, context);
-1290,17 +1307,6
// Add listener to the NamingResources listener list
namingResources.addPropertyChangeListener(listener);
-
-} else if (event.getType().equals(Lifecycle.BEFORE_STOP_EVENT)) {
-
-// Remove context
-contexts.remove(context);
-
-// Remove listener from the NamingResource listener list
-namingResources.removePropertyChangeListener(listener);
-
-// Remove listener from lifecycle listeners
-context.removeLifecycleListener(this);
}
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
