markt 2004/07/29 15:11:59
Modified: catalina/src/share/org/apache/catalina/mbeans
DefaultContextMBean.java MBeanUtils.java
NamingResourcesMBean.java StandardContextMBean.java
Log:
Update MBeans to use new quote() and unquote() methods.
Revision Changes Path
1.6 +3 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
Index: DefaultContextMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultContextMBean.java 15 Apr 2004 01:44:09 -0000 1.5
+++ DefaultContextMBean.java 29 Jul 2004 22:11:59 -0000 1.6
@@ -16,7 +16,6 @@
package org.apache.catalina.mbeans;
-import java.net.URLDecoder;
import java.util.ArrayList;
import javax.management.MBeanException;
@@ -301,7 +300,7 @@
*/
public void removeResource(String resourceName) {
- resourceName = URLDecoder.decode(resourceName);
+ resourceName = ObjectName.unquote(resourceName);
NamingResources nresources = getNamingResources();
if (nresources == null) {
return;
@@ -322,7 +321,7 @@
*/
public void removeResourceLink(String resourceLinkName) {
- resourceLinkName = URLDecoder.decode(resourceLinkName);
+ resourceLinkName = ObjectName.unquote(resourceLinkName);
NamingResources nresources = getNamingResources();
if (nresources == null) {
return;
1.30 +12 -25
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MBeanUtils.java 29 Jul 2004 19:19:43 -0000 1.29
+++ MBeanUtils.java 29 Jul 2004 22:11:59 -0000 1.30
@@ -18,7 +18,6 @@
import java.lang.reflect.Method;
-import java.net.URLEncoder;
import java.util.Hashtable;
import javax.management.Attribute;
@@ -113,19 +112,6 @@
// --------------------------------------------------------- Static Methods
/**
- * Translates a string into x-www-form-urlencoded format
- *
- * @param t string to be encoded
- * @return encoded string
- */
- private static final String encodeStr(String t) {
-
- return URLEncoder.encode(t);
-
- }
-
-
- /**
* Create and return the name of the <code>ManagedBean</code> that
* corresponds to this Catalina component.
*
@@ -908,13 +894,13 @@
throws MalformedObjectNameException {
ObjectName name = null;
- String encodedResourceName = encodeStr(resource.getName());
+ String quotedResourceName = ObjectName.quote(resource.getName());
Object container =
resource.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=Resource" +
",resourcetype=Global,class=" + resource.getType() +
- ",name=" + encodedResourceName);
+ ",name=" + quotedResourceName);
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1)
@@ -926,7 +912,7 @@
",resourcetype=Context,path=" + path +
",host=" + host.getName() +
",class=" + resource.getType() +
- ",name=" + encodedResourceName);
+ ",name=" + quotedResourceName);
} else if (container instanceof DefaultContext) {
container = ((DefaultContext)container).getParent();
if (container instanceof Host) {
@@ -935,13 +921,13 @@
name = new ObjectName(domain + ":type=Resource" +
",resourcetype=HostDefaultContext,host=" + host.getName() +
",class=" + resource.getType() +
- ",name=" + encodedResourceName);
+ ",name=" + quotedResourceName);
} else if (container instanceof Engine) {
Engine engine = (Engine) container;
Service service = engine.getService();
name = new ObjectName(domain + ":type=Resource" +
",resourcetype=ServiceDefaultContext,class=" +
resource.getType() +
- ",name=" + encodedResourceName);
+ ",name=" + quotedResourceName);
}
}
@@ -964,13 +950,14 @@
throws MalformedObjectNameException {
ObjectName name = null;
- String encodedResourceLinkName = encodeStr(resourceLink.getName());
+ String quotedResourceLinkName
+ = ObjectName.quote(resourceLink.getName());
Object container =
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=ResourceLink" +
",resourcetype=Global" +
- ",name=" + encodedResourceLinkName);
+ ",name=" + quotedResourceLinkName);
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1)
@@ -981,7 +968,7 @@
name = new ObjectName(domain + ":type=ResourceLink" +
",resourcetype=Context,path=" + path +
",host=" + host.getName() +
- ",name=" + encodedResourceLinkName);
+ ",name=" + quotedResourceLinkName);
} else if (container instanceof DefaultContext) {
container = ((DefaultContext)container).getParent();
if (container instanceof Host) {
@@ -989,12 +976,12 @@
Service service = ((Engine)host.getParent()).getService();
name = new ObjectName(domain + ":type=ResourceLink" +
",resourcetype=HostDefaultContext,host=" + host.getName() +
- ",name=" + encodedResourceLinkName);
+ ",name=" + quotedResourceLinkName);
} else if (container instanceof Engine) {
Engine engine = (Engine) container;
Service service = engine.getService();
name = new ObjectName(domain + ":type=ResourceLink" +
- ",resourcetype=ServiceDefaultContext,name=" +
encodedResourceLinkName);
+ ",resourcetype=ServiceDefaultContext,name=" +
quotedResourceLinkName);
}
}
1.8 +3 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NamingResourcesMBean.java 26 Jul 2004 16:04:01 -0000 1.7
+++ NamingResourcesMBean.java 29 Jul 2004 22:11:59 -0000 1.8
@@ -16,7 +16,6 @@
package org.apache.catalina.mbeans;
-import java.net.URLDecoder;
import java.util.ArrayList;
import javax.management.MBeanException;
@@ -296,7 +295,7 @@
*/
public void removeResource(String resourceName) {
- resourceName = URLDecoder.decode(resourceName);
+ resourceName = ObjectName.unquote(resourceName);
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
return;
@@ -318,7 +317,7 @@
*/
public void removeResourceLink(String resourceLinkName) {
- resourceLinkName = URLDecoder.decode(resourceLinkName);
+ resourceLinkName = ObjectName.unquote(resourceLinkName);
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
return;
1.8 +3 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
Index: StandardContextMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardContextMBean.java 15 Apr 2004 01:44:09 -0000 1.7
+++ StandardContextMBean.java 29 Jul 2004 22:11:59 -0000 1.8
@@ -16,7 +16,6 @@
package org.apache.catalina.mbeans;
-import java.net.URLDecoder;
import java.util.ArrayList;
import javax.management.MBeanException;
@@ -330,7 +329,7 @@
*/
public void removeResource(String resourceName) {
- resourceName = URLDecoder.decode(resourceName);
+ resourceName = ObjectName.unquote(resourceName);
NamingResources nresources = getNamingResources();
if (nresources == null) {
return;
@@ -351,7 +350,7 @@
*/
public void removeResourceLink(String resourceLinkName) {
- resourceLinkName = URLDecoder.decode(resourceLinkName);
+ resourceLinkName = ObjectName.unquote(resourceLinkName);
NamingResources nresources = getNamingResources();
if (nresources == null) {
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
