cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r541356 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/management/ rt/core/src/main/java/org/apache/cxf/bus/ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/core/src/main/java/org/apache/cxf/workqueue/ rt/management...
Date Thu, 24 May 2007 17:00:10 GMT
Author: ningjiang
Date: Thu May 24 10:00:08 2007
New Revision: 541356

URL: http://svn.apache.org/viewvc?view=rev&rev=541356
Log:
[CXF-686]Clean up the managed Components' ObjectName 

Now the ObjectName patterns are
DomainName:bus.id=CXF...,type=...[,service=...][,port=...][,operation=...]

Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/management/ManagementConstants.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
    incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/Counter.java
    incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
    incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
    incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/management/ManagementConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/management/ManagementConstants.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/management/ManagementConstants.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/management/ManagementConstants.java
Thu May 24 10:00:08 2007
@@ -26,6 +26,9 @@
     public static final String NAME_PROP = "name";
     public static final String TYPE_PROP = "type";
     public static final String DESCRIPTION_PROP = "description";
+    public static final String SERVICE_NAME_PROP = "service";
+    public static final String OPERATION_NAME_PROP = "operation";
+    public static final String PORT_NAME_PROP = "port";
     
     private ManagementConstants() {
         

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java Thu May 24
10:00:08 2007
@@ -28,7 +28,7 @@
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
 
 public class CXFBusImpl extends AbstractBasicInterceptorProvider implements Bus {    
-    protected static final String DEFAULT_BUS_ID = "cxf";
+    protected static final String DEFAULT_BUS_ID = "CXF";
     private Map<Class, Object> extensions;
     private BusLifeCycleManager lifeCycleManager;
     private String id;

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java Thu May 24
10:00:08 2007
@@ -45,10 +45,11 @@
     }
     
     public ObjectName getObjectName() throws JMException {
-        String busId = bus.getId() == null ? Integer.toString(bus.hashCode()) : bus.getId();
+        String busId = bus.getId();
         StringBuffer buffer = new StringBuffer(ManagementConstants.DEFAULT_DOMAIN_NAME +
":");
-        buffer.append(ManagementConstants.TYPE_PROP + "="  + TYPE_VALUE + ",");
-        buffer.append(ManagementConstants.NAME_PROP + "=" + "Bus.ID." + busId);
+        buffer.append(ManagementConstants.BUS_ID_PROP + "=" +  busId + ",");
+        buffer.append(ManagementConstants.TYPE_PROP + "="  + TYPE_VALUE);
+        
 
         return new ObjectName(buffer.toString());
     }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
Thu May 24 10:00:08 2007
@@ -72,17 +72,18 @@
     }
         
     public ObjectName getObjectName() throws JMException {
-        String busId = bus.getId() == null ? Integer.toString(bus.hashCode()) : bus.getId();
+        String busId = bus.getId();
         StringBuffer buffer = new StringBuffer();
         buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
+        buffer.append(ManagementConstants.BUS_ID_PROP + "=" + busId + ",");
         buffer.append(ManagementConstants.TYPE_PROP + "=" + "Bus.Service.Endpoint,");
-        buffer.append("Bus.ID=" + "BUS.ID." + busId + ",");
+       
 
         String serviceName = ObjectName.quote(endpoint.getEndpointInfo().getService().getName().toString());
-        buffer.append("Service=" + serviceName + ",");
+        buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ",");
         String endpointName = ObjectName.quote(endpoint.getEndpointInfo().getName().toString());
-        buffer.append(ManagementConstants.NAME_PROP + "=" + endpointName);
-
+        buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + endpointName);
+        
         //Use default domain name of server
         return new ObjectName(buffer.toString());
     }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java
Thu May 24 10:00:08 2007
@@ -19,9 +19,6 @@
 
 package org.apache.cxf.workqueue;
 
-import java.util.Hashtable;
-import java.util.Map;
-
 import javax.management.JMException;
 import javax.management.ObjectName;
 
@@ -120,15 +117,17 @@
     }
 
     public ObjectName getObjectName() throws JMException {
-        Map<String, String> table = new Hashtable<String, String>();
-        String busId = bus.getId() == null ? Integer.toString(bus.hashCode()) : bus.getId();
-
-        table.put(ManagementConstants.BUS_ID_PROP, busId);
-        table.put(ManagementConstants.NAME_PROP, NAME_VALUE);
-        table.put(ManagementConstants.TYPE_PROP, TYPE_VALUE);
+        
+        String busId = bus.getId();        
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
+        buffer.append(ManagementConstants.BUS_ID_PROP + "=" + busId + ",");
+        buffer.append(ManagementConstants.TYPE_PROP + "=" + TYPE_VALUE + ",");
+        buffer.append(ManagementConstants.NAME_PROP + "=" + NAME_VALUE);
 
+       
         //Use default domain name of server
-        return new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME, (Hashtable)table);
+        return new ObjectName(buffer.toString());
     }
     
 }

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/Counter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/Counter.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/Counter.java
(original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/Counter.java
Thu May 24 10:00:08 2007
@@ -22,7 +22,8 @@
 import org.apache.cxf.management.ManagedComponent;
 
 public interface Counter extends ManagedComponent {
-    String DEFAULT_DOMAIN_NAME  = "org.apache.cxf";
+    
+    String PERFORMANCE_COUNTER = "Performance.Counter";   
     
     void increase(MessageHandlingTimeRecorder mhtr);  
         

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
Thu May 24 10:00:08 2007
@@ -28,6 +28,7 @@
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.management.ManagementConstants;
 import org.apache.cxf.management.counters.Counter;
 import org.apache.cxf.management.counters.CounterRepository;
 import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
@@ -108,19 +109,19 @@
             String operationName = "\"" + opInfo.getName().toString() + "\"";
             
             StringBuffer buffer = new StringBuffer();
-            buffer.append(Counter.DEFAULT_DOMAIN_NAME + ":");
-            buffer.append("BusID=" + bus.getId() + ",");
+            buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
+            buffer.append(ManagementConstants.BUS_ID_PROP + "=" + bus.getId() + ",");
             if (isClient(message)) {
-                buffer.append("Type=Counter_Client,");
+                buffer.append(ManagementConstants.TYPE_PROP + "=" + Counter.PERFORMANCE_COUNTER
+ ".Client,");
             } else {
-                buffer.append("Type=Counter_Server,");
+                buffer.append(ManagementConstants.TYPE_PROP + "=" + Counter.PERFORMANCE_COUNTER
+ ".Server,");
             }
-            buffer.append("ServiceName=" + serviceName + ",");
+            buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ",");
            
-            buffer.append("PortName=" + portName);
+            buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + portName);
             String serviceCounterName = buffer.toString();
             
-            buffer.append(",OperationName=" + operationName);
+            buffer.append("," + ManagementConstants.OPERATION_NAME_PROP + "=" + operationName);
             String operationCounterName = buffer.toString();
             try {               
                 ObjectName serviceCounter = 

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
(original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
Thu May 24 10:00:08 2007
@@ -117,7 +117,7 @@
                 try {
                     //Register Bus here since we can guarantee that Instrumentation 
                     //infrastructure has been initialized.
-                    ManagedBus mbus = new ManagedBus(bus);
+                    ManagedBus mbus = new ManagedBus(bus);                    
                     register(mbus);
                 } catch (JMException jmex) {
                     LOG.log(Level.SEVERE, "REGISTER_FAILURE_MSG", new Object[]{bus, jmex});

Modified: incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
(original)
+++ incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
Thu May 24 10:00:08 2007
@@ -44,12 +44,12 @@
     protected static final QName PORT_NAME = new QName("http://org.apache.cxf", "port");
     
     protected static final String CLIENT_SERVICE_ONAME =
-        "org.apache.cxf:Type=Counter_Client,BusID=cxf,ServiceName=\"" 
-        + SERVICE_NAME.toString() + "\",PortName=\"" 
+        "org.apache.cxf:type=Performance.Counter.Client,bus.id=cxf,service=\"" 
+        + SERVICE_NAME.toString() + "\",port=\"" 
         + PORT_NAME + "\"";
     protected static final String SERVER_SERVICE_ONAME = 
-        "org.apache.cxf:Type=Counter_Server,BusID=cxf,ServiceName=\"" 
-        + SERVICE_NAME.toString() + "\",PortName=\"" 
+        "org.apache.cxf:type=Performance.Counter.Server,bus.id=cxf,service=\"" 
+        + SERVICE_NAME.toString() + "\",port=\"" 
         + PORT_NAME + "\"";
     protected ObjectName clientServiceCounterOName;
     protected ObjectName serverServiceCounterOName;
@@ -70,10 +70,10 @@
         clientServiceCounterOName = new ObjectName(CLIENT_SERVICE_ONAME);
         serverServiceCounterOName = new ObjectName(SERVER_SERVICE_ONAME);
         clientOperationCounterOName = new ObjectName(CLIENT_SERVICE_ONAME 
-                                               + ",OperationName=\"" 
+                                               + ",operation=\"" 
                                                + OPERATION_NAME.toString() + "\"");
         serverOperationCounterOName = new ObjectName(SERVER_SERVICE_ONAME 
-                                                     + ",OperationName=\"" 
+                                                     + ",operation=\"" 
                                                      + OPERATION_NAME.toString() + "\"");
         
         

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java
Thu May 24 10:00:08 2007
@@ -31,7 +31,7 @@
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.management.InstrumentationManager;
-import org.apache.cxf.management.counters.Counter;
+import org.apache.cxf.management.ManagementConstants;
 import org.apache.cxf.management.counters.CounterRepository;
 import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -90,8 +90,9 @@
         assertNotNull(impl.getMBeanServer());
         
         MBeanServer mbs = im.getMBeanServer();
-        ObjectName name = new ObjectName(Counter.DEFAULT_DOMAIN_NAME 
-                                         + ":BusID=cxf" + bus.hashCode() + ",*");       

+        ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME 
+                                         + ":" + ManagementConstants.BUS_ID_PROP
+                                         + "=CXF" + bus.hashCode() + ",*");        
         
         SOAPService service = new SOAPService();
         assertNotNull(service);        
@@ -106,10 +107,10 @@
         
         assertEquals("The Counters are not create yet", 4, cr.getCounters().size());
         Set counterNames = mbs.queryNames(name, null);
-        assertEquals("The Counters are not export to JMX ", 4, counterNames.size());
+        assertEquals("The Counters are not export to JMX ", 4 + 2 , counterNames.size());
        
-        ObjectName sayHiCounter =  new ObjectName(Counter.DEFAULT_DOMAIN_NAME 
-            + ":OperationName=\"{http://apache.org/hello_world_soap_http}sayHi\",*"); 
+        ObjectName sayHiCounter =  new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME

+            + ":operation=\"{http://apache.org/hello_world_soap_http}sayHi\",*"); 
         
         Set s = mbs.queryNames(sayHiCounter, null);        
         Iterator it = s.iterator();
@@ -136,10 +137,10 @@
         greeter.greetMeOneWay("hello");
         assertEquals("The Counters are not create yet", 6, cr.getCounters().size());
         counterNames = mbs.queryNames(name, null);
-        assertEquals("The Counters are not export to JMX ", 6, counterNames.size());
+        assertEquals("The Counters are not export to JMX ", 6 + 2, counterNames.size());
         
-        ObjectName greetMeOneWayCounter =  new ObjectName(Counter.DEFAULT_DOMAIN_NAME 
-            + ":OperationName=\"{http://apache.org/hello_world_soap_http}greetMeOneWay\",*");
+        ObjectName greetMeOneWayCounter =  new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME

+            + ":operation=\"{http://apache.org/hello_world_soap_http}greetMeOneWay\",*");
         
         s = mbs.queryNames(greetMeOneWayCounter, null);        
         it = s.iterator();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
Thu May 24 10:00:08 2007
@@ -61,7 +61,7 @@
         InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
         assertNotNull(im);
         InstrumentationManagerImpl imi = (InstrumentationManagerImpl)im;
-        assertEquals("service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi", imi.getJMXServiceURL());
+        assertEquals("service:jmx:rmi:///jndi/rmi://localhost:9916/jmxrmi", imi.getJMXServiceURL());
         assertTrue(imi.isEnabled());
         assertNotNull(imi.getMBeanServer());
 
@@ -93,6 +93,6 @@
             mbs.invoke(n, "shutdown", params, sig);            
         }        
         
-        //bus.shutdown(true);
+        bus.shutdown(true);
     }
 }

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
Thu May 24 10:00:08 2007
@@ -77,7 +77,7 @@
     
     @Test
     public void testManagedEndpoint() throws Exception {
-        Bus bus = BusFactory.getDefaultBus();
+        Bus bus = SpringBusFactory.getDefaultBus();
         InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
         assertNotNull(im);
         InstrumentationManagerImpl impl = (InstrumentationManagerImpl)im;
@@ -87,7 +87,8 @@
         MBeanServer mbs = im.getMBeanServer();        
         ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME 
                                          + ":type=Bus.Service.Endpoint,*");
-        Set s = mbs.queryNames(name, null);
+        Set s = mbs.queryNames(name, null); 
+        System.out.println("the size is " + s.size());
         assertTrue(s.size() == 1);
         name = (ObjectName)s.iterator().next();
         
@@ -124,7 +125,8 @@
         
         reply = greeter.sayHi();
         assertNotNull("no response received from service", reply);
-        assertEquals(response, reply);               
+        assertEquals(response, reply); 
+        
     }
     
 }

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
Thu May 24 10:00:08 2007
@@ -26,7 +26,7 @@
     <bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
         <property name="bus" ref="cxf" />
         <property name="enabled" value="true" />
-        <property name="JMXServiceURL" value="service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi"
/>
+        <property name="JMXServiceURL" value="service:jmx:rmi:///jndi/rmi://localhost:9915/jmxrmi"
/>
     </bean>
     
     <bean id="org.apache.cxf.management.counters.CounterRepository" class="org.apache.cxf.management.counters.CounterRepository">

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml?view=diff&rev=541356&r1=541355&r2=541356
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
Thu May 24 10:00:08 2007
@@ -26,7 +26,7 @@
     <bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
         <property name="bus" ref="cxf" />
         <property name="enabled" value="true" />
-        <property name="JMXServiceURL" value="service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi"
/>
+        <property name="JMXServiceURL" value="service:jmx:rmi:///jndi/rmi://localhost:9916/jmxrmi"
/>
     </bean> 
  
 </beans>



Mime
View raw message