svn commit: r357184 - in /incubator/activemq/trunk/activemq-core/src/main/java/org/activemq: broker/jmx/ManagedRegionBroker.java broker/jmx/ManagedTransportConnection.java util/JMXSupport.java

[jstrachan]

Author: jstrachan
Date: Fri Dec 16 09:08:15 2005
New Revision: 357184

URL: http://svn.apache.org/viewcvs?rev=357184&view=rev
Log:
rolled back the use of ObjectName.quote() as it appends quotes and went back to 
Hiram's original code which looks much nicer in JMX consoles :)

Modified:
    
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
    
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
    
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/JMXSupport.java

Modified: 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java?rev=357184&r1=357183&r2=357184&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
 Fri Dec 16 09:08:15 2005
@@ -65,7 +65,7 @@
         
         // Build the object name for the destination
         Hashtable map = new Hashtable(brokerObjectName.getKeyPropertyList());
-        
map.put("Type",ObjectName.quote(destName.getDestinationTypeAsString()));
+        
map.put("Type",JMXSupport.encodeObjectNamePart(destName.getDestinationTypeAsString()));
         map.put("Destination", 
JMXSupport.encodeObjectNamePart(destName.getPhysicalName()));
         ObjectName destObjectName= new 
ObjectName(brokerObjectName.getDomain(), map);
         
@@ -77,7 +77,7 @@
     public void unregister(ActiveMQDestination destName) throws Throwable {
         // Build the object name for the destination
         Hashtable map = new Hashtable(brokerObjectName.getKeyPropertyList());
-        
map.put("Type",ObjectName.quote(destName.getDestinationTypeAsString()));
+        
map.put("Type",JMXSupport.encodeObjectNamePart(destName.getDestinationTypeAsString()));
         map.put("Destination", 
JMXSupport.encodeObjectNamePart(destName.getPhysicalName()));
         ObjectName destObjectName= new 
ObjectName(brokerObjectName.getDomain(), map);
         

Modified: 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java?rev=357184&r1=357183&r2=357184&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
 Fri Dec 16 09:08:15 2005
@@ -116,7 +116,7 @@
         // Build the object name for the destination
         Hashtable map = new Hashtable(connectorName.getKeyPropertyList());
         map.put("Type", "Connection");
-        String jmxConnectionId = ObjectName.quote(connectionId);
+        String jmxConnectionId = JMXSupport.encodeObjectNamePart(connectionId);
         map.put("Connection", JMXSupport.encodeObjectNamePart(connectionId));
         try {
             return new ObjectName(connectorName.getDomain(), map);

Modified: 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/JMXSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/JMXSupport.java?rev=357184&r1=357183&r2=357184&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/JMXSupport.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/JMXSupport.java
 Fri Dec 16 09:08:15 2005
@@ -4,13 +4,10 @@
 
 public class JMXSupport {
     static public String encodeObjectNamePart(String part) {
-        return ObjectName.quote(part);
-        /*
+        //return ObjectName.quote(part);
         String answer = part.replaceAll("[\\:\\,\\'\\\"]", "_");
         answer = answer.replaceAll("\\?", "&qe;");
         answer = answer.replaceAll("=", "&");
         return answer;
-        */
-        
     }
 }