amyroh 2002/06/24 14:11:42
Modified: catalina/src/share/org/apache/catalina/mbeans
ContextResourceMBean.java NamingResourcesMBean.java
mbeans-descriptors.xml
Added: catalina/src/share/org/apache/catalina/mbeans
ContextEnvironmentMBean.java
ContextResourceLinkMBean.java
Log:
Fix (hopefully) for JNDI resources in admin webapp. The problem was that
the objects were added in NamingResources when they are not fully
initialized. They need to be fully initialized before any mutation happens.
Also, this fix removes resources and add back each time there is a modification.
Revision Changes Path
1.8 +10 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
Index: ContextResourceMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContextResourceMBean.java 18 Jun 2002 03:19:12 -0000 1.7
+++ ContextResourceMBean.java 24 Jun 2002 21:11:42 -0000 1.8
@@ -74,7 +74,6 @@
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
-import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.ResourceParams;
@@ -246,6 +245,12 @@
}
cr.getNamingResources().addResourceParams(rp);
}
+
+ // cannot use side-efects. It's removed and added back each time
+ // there is a modification in a resource.
+ NamingResources nr = cr.getNamingResources();
+ nr.removeResource(cr.getName());
+ nr.addResource(cr);
}
}
1.10 +13 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NamingResourcesMBean.java 20 Jun 2002 02:32:15 -0000 1.9
+++ NamingResourcesMBean.java 24 Jun 2002 21:11:42 -0000 1.10
@@ -204,8 +204,10 @@
* Add an environment entry for this web application.
*
* @param envName New environment entry name
+ * @param type The type of the new environment entry
+ * @param value The value of the new environment entry
*/
- public String addEnvironment(String envName, String type)
+ public String addEnvironment(String envName, String type, String value)
throws MalformedObjectNameException {
NamingResources nresources = (NamingResources) this.resource;
@@ -220,6 +222,7 @@
env = new ContextEnvironment();
env.setName(envName);
env.setType(type);
+ env.setValue(value);
nresources.addEnvironment(env);
// Return the corresponding MBean name
@@ -235,6 +238,7 @@
* Add a resource reference for this web application.
*
* @param resourceName New resource reference name
+ * @param type New resource reference type
*/
public String addResource(String resourceName, String type)
throws MalformedObjectNameException {
@@ -264,10 +268,12 @@
/**
* Add a resource link reference for this web application.
*
+ * @param global New resource link reference global name
* @param resourceLinkName New resource link reference name
+ * @param type New resource link reference type
*/
- public String addResourceLink(String resourceLinkName, String type,
- String global) throws MalformedObjectNameException {
+ public String addResourceLink(String global, String resourceLinkName,
+ String type) throws MalformedObjectNameException {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
1.63 +18 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- mbeans-descriptors.xml 19 Jun 2002 21:17:19 -0000 1.62
+++ mbeans-descriptors.xml 24 Jun 2002 21:11:42 -0000 1.63
@@ -128,7 +128,7 @@
<mbean name="ContextEnvironment"
- className="org.apache.catalina.mbeans.ClassNameMBean"
+ className="org.apache.catalina.mbeans.ContextEnvironmentMBean"
description="Representation of an application environment entry"
domain="Catalina"
group="Resources"
@@ -194,7 +194,7 @@
<mbean name="ContextResourceLink"
- className="org.apache.catalina.mbeans.ClassNameMBean"
+ className="org.apache.catalina.mbeans.ContextResourceLinkMBean"
description="Representation of a resource link for a web application"
domain="Catalina"
group="Resources"
@@ -1619,6 +1619,12 @@
<parameter name="envName"
description="New environment entry name"
type="java.lang.String"/>
+ <parameter name="type"
+ description="New environment entry type"
+ type="java.lang.String"/>
+ <parameter name="value"
+ description="New environment entry value"
+ type="java.lang.String"/>
</operation>
<operation name="addResource"
@@ -1628,14 +1634,23 @@
<parameter name="resourceName"
description="New resource reference name"
type="java.lang.String"/>
+ <parameter name="type"
+ description="New resource reference type"
+ type="java.lang.String"/>
</operation>
<operation name="addResourceLink"
description="Add a resource link reference for this web application"
impact="ACTION"
returnType="void">
+ <parameter name="global"
+ description="New resource reference global name"
+ type="java.lang.String"/>
<parameter name="resourceLinkName"
description="New resource reference name"
+ type="java.lang.String"/>
+ <parameter name="type"
+ description="New resource reference type"
type="java.lang.String"/>
</operation>
1.1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
Index: ContextEnvironmentMBean.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java,v
1.1 2002/06/24 21:11:42 amyroh Exp $
* $Revision: 1.1 $
* $Date: 2002/06/24 21:11:42 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 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.mbeans;
import java.util.ArrayList;
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.NamingResources;
import org.apache.commons.modeler.BaseModelMBean;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
* <code>org.apache.catalina.deploy.ContextEnvironment</code> component.</p>
*
* @author Amy Roh
* @version $Revision: 1.1 $ $Date: 2002/06/24 21:11:42 $
*/
public class ContextEnvironmentMBean extends BaseModelMBean {
// ----------------------------------------------------------- Constructors
/**
* Construct a <code>ModelMBean</code> with default
* <code>ModelMBeanInfo</code> information.
*
* @exception MBeanException if the initializer of an object
* throws an exception
* @exception RuntimeOperationsException if an IllegalArgumentException
* occurs
*/
public ContextEnvironmentMBean()
throws MBeanException, RuntimeOperationsException {
super();
}
// ----------------------------------------------------- Instance Variables
// ------------------------------------------------------------- Attributes
/**
* Set the value of a specific attribute of this MBean.
*
* @param attribute The identification of the attribute to be set
* and the new value
*
* @exception AttributeNotFoundException if this attribute is not
* supported by this MBean
* @exception MBeanException if the initializer of an object
* throws an exception
* @exception ReflectionException if a Java reflection exception
* occurs when invoking the getter
*/
public void setAttribute(Attribute attribute)
throws AttributeNotFoundException, MBeanException,
ReflectionException {
super.setAttribute(attribute);
ContextEnvironment ce = null;
try {
ce = (ContextEnvironment) getManagedResource();
} catch (InstanceNotFoundException e) {
throw new MBeanException(e);
} catch (InvalidTargetObjectTypeException e) {
throw new MBeanException(e);
}
// cannot use side-efects. It's removed and added back each time
// there is a modification in a resource.
NamingResources nr = ce.getNamingResources();
nr.removeEnvironment(ce.getName());
nr.addEnvironment(ce);
}
}
1.1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
Index: ContextResourceLinkMBean.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java,v
1.1 2002/06/24 21:11:42 amyroh Exp $
* $Revision: 1.1 $
* $Date: 2002/06/24 21:11:42 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 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.mbeans;
import java.util.ArrayList;
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.ResourceParams;
import org.apache.commons.modeler.BaseModelMBean;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
* <code>org.apache.catalina.deploy.ContextResourceLink</code> component.</p>
*
* @author Amy Roh
* @version $Revision: 1.1 $ $Date: 2002/06/24 21:11:42 $
*/
public class ContextResourceLinkMBean extends BaseModelMBean {
// ----------------------------------------------------------- Constructors
/**
* Construct a <code>ModelMBean</code> with default
* <code>ModelMBeanInfo</code> information.
*
* @exception MBeanException if the initializer of an object
* throws an exception
* @exception RuntimeOperationsException if an IllegalArgumentException
* occurs
*/
public ContextResourceLinkMBean()
throws MBeanException, RuntimeOperationsException {
super();
}
// ----------------------------------------------------- Instance Variables
// ------------------------------------------------------------- Attributes
/**
* Set the value of a specific attribute of this MBean.
*
* @param attribute The identification of the attribute to be set
* and the new value
*
* @exception AttributeNotFoundException if this attribute is not
* supported by this MBean
* @exception MBeanException if the initializer of an object
* throws an exception
* @exception ReflectionException if a Java reflection exception
* occurs when invoking the getter
*/
public void setAttribute(Attribute attribute)
throws AttributeNotFoundException, MBeanException,
ReflectionException {
super.setAttribute(attribute);
ContextResourceLink crl = null;
try {
crl = (ContextResourceLink) getManagedResource();
} catch (InstanceNotFoundException e) {
throw new MBeanException(e);
} catch (InvalidTargetObjectTypeException e) {
throw new MBeanException(e);
}
// cannot use side-efects. It's removed and added back each time
// there is a modification in a resource.
NamingResources nr = crl.getNamingResources();
nr.removeResourceLink(crl.getName());
nr.addResourceLink(crl);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
