remm 2002/12/10 10:12:51
Modified: catalina/src/share/org/apache/catalina/mbeans
NamingResourcesMBean.java mbeans-descriptors.xml
Log:
- Fix bug 15239.
- Remove useless parameter.
Revision Changes Path
1.2 +6 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamingResourcesMBean.java 18 Jul 2002 16:48:00 -0000 1.1
+++ NamingResourcesMBean.java 10 Dec 2002 18:12:51 -0000 1.2
@@ -272,8 +272,8 @@
* @param resourceLinkName New resource link reference name
* @param type New resource link reference type
*/
- public String addResourceLink(String global, String resourceLinkName,
- String type) throws MalformedObjectNameException {
+ public String addResourceLink(String resourceLinkName, String type)
+ throws MalformedObjectNameException {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
@@ -289,7 +289,6 @@
resourceLink = new ContextResourceLink();
resourceLink.setName(resourceLinkName);
resourceLink.setType(type);
- resourceLink.setGlobal(global);
nresources.addResourceLink(resourceLink);
// Return the corresponding MBean name
1.15 +1 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mbeans-descriptors.xml 8 Dec 2002 13:42:09 -0000 1.14
+++ mbeans-descriptors.xml 10 Dec 2002 18:12:51 -0000 1.15
@@ -1701,9 +1701,6 @@
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"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
