svn commit: r702970 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/management/ camel-core/src/test/java/org/apache/camel/management/ components/camel-spring/src/test/java/org/apache/camel/spring/

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r702970 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/management/ camel-core/src/test/java/org/apache/camel/management/ components/camel-spring/src/test/java/org/apache/camel/spring/

hadrian-3
Author: hadrian
Date: Wed Oct  8 12:08:51 2008
New Revision: 702970

URL: http://svn.apache.org/viewvc?rev=702970&view=rev
Log:
CAMEL-865

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=702970&r1=702969&r2=702970&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Wed Oct  8 12:08:51 2008
@@ -43,10 +43,10 @@
     public static final String KEY_ROUTE = "route";
     public static final String KEY_NODE_ID = "nodeid";
     public static final String TYPE_CONTEXT = "context";
-    public static final String TYPE_ENDPOINT = "endpoint";
-    public static final String TYPE_PROCESSOR = "processor";
-    public static final String TYPE_CONSUMER = "consumer";
-    public static final String TYPE_ROUTE = "route";
+    public static final String TYPE_ENDPOINT = "endpoints";
+    public static final String TYPE_PROCESSOR = "processors";
+    public static final String TYPE_CONSUMER = "consumers";
+    public static final String TYPE_ROUTE = "routes";
 
     protected String domainName;
     protected String hostName = "locahost";

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java?rev=702970&r1=702969&r2=702970&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java Wed Oct  8 12:08:51 2008
@@ -53,19 +53,19 @@
         resolveMandatoryEndpoint("mock:end", MockEndpoint.class);
 
         Set s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=endpoint,*"), null);
+                new ObjectName(domainName + ":type=endpoints,*"), null);
         assertEquals("Could not find 0 endpoints: " + s, 0, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=context,*"), null);
+                new ObjectName(domainName + ":type=contexts,*"), null);
         assertEquals("Could not find 0 context: " + s, 0, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=processor,*"), null);
+                new ObjectName(domainName + ":type=processors,*"), null);
         assertEquals("Could not find 0 processor: " + s, 0, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=route,*"), null);
+                new ObjectName(domainName + ":type=routes,*"), null);
         assertEquals("Could not find 0 route: " + s, 0, s.size());
 
     }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=702970&r1=702969&r2=702970&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Wed Oct  8 12:08:51 2008
@@ -52,7 +52,7 @@
         resolveMandatoryEndpoint("mock:end", MockEndpoint.class);
 
         Set s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=endpoint,*"), null);
+                new ObjectName(domainName + ":type=endpoints,*"), null);
         assertEquals("Could not find 2 endpoints: " + s, 2, s.size());
 
         s = mbsc.queryNames(
@@ -60,11 +60,11 @@
         assertEquals("Could not find 1 context: " + s, 1, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=processor,*"), null);
+                new ObjectName(domainName + ":type=processors,*"), null);
         assertEquals("Could not find 1 processor: " + s, 1, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=route,*"), null);
+                new ObjectName(domainName + ":type=routes,*"), null);
         assertEquals("Could not find 1 route: " + s, 1, s.size());
 
     }
@@ -77,8 +77,8 @@
 
         resultEndpoint.assertIsSatisfied();
 
-        verifyCounter(mbsc, new ObjectName(domainName + ":type=route,*"));
-        verifyCounter(mbsc, new ObjectName(domainName + ":type=processor,*"));
+        verifyCounter(mbsc, new ObjectName(domainName + ":type=routes,*"));
+        verifyCounter(mbsc, new ObjectName(domainName + ":type=processors,*"));
 
     }
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java?rev=702970&r1=702969&r2=702970&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java Wed Oct  8 12:08:51 2008
@@ -52,7 +52,7 @@
         resolveMandatoryEndpoint("mock:end", MockEndpoint.class);
 
         Set s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=endpoint,*"), null);
+                new ObjectName(domainName + ":type=endpoints,*"), null);
         assertEquals("Could not find 2 endpoints: " + s, 2, s.size());
 
         s = mbsc.queryNames(
@@ -60,11 +60,11 @@
         assertEquals("Could not find 1 context: " + s, 1, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=processor,*"), null);
+                new ObjectName(domainName + ":type=processors,*"), null);
         assertEquals("Could not find 2 processor: " + s, 2, s.size());
 
         s = mbsc.queryNames(
-                new ObjectName(domainName + ":type=route,*"), null);
+                new ObjectName(domainName + ":type=routes,*"), null);
         assertEquals("Could not find 1 route: " + s, 1, s.size());
 
     }
@@ -79,9 +79,9 @@
 
         resultEndpoint.assertIsSatisfied();
 
-        verifyCounter(mbsc, new ObjectName(domainName + ":type=route,*"));
-        verifyCounter(mbsc, new ObjectName(domainName + ":type=processor,nodeid=to3,*"));
-        verifyCounter(mbsc, new ObjectName(domainName + ":type=processor,nodeid=to4,*"));
+        verifyCounter(mbsc, new ObjectName(domainName + ":type=routes,*"));
+        verifyCounter(mbsc, new ObjectName(domainName + ":type=processors,nodeid=to3,*"));
+        verifyCounter(mbsc, new ObjectName(domainName + ":type=processors,nodeid=to4,*"));
 
     }
 

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java?rev=702970&r1=702969&r2=702970&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java Wed Oct  8 12:08:51 2008
@@ -64,8 +64,8 @@
     }
 
     public void testQueryMbeans() throws Exception {
-        assertEquals(1, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=route,*"), null).size());
-        assertEquals(1, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=processor,*"), null).size());
+        assertEquals(1, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=routes,*"), null).size());
+        assertEquals(1, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=processors,*"), null).size());
     }
 
     @Override

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java?rev=702970&r1=702969&r2=702970&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java Wed Oct  8 12:08:51 2008
@@ -36,8 +36,8 @@
   
     @Override
     public void testQueryMbeans() throws Exception {
-        assertEquals(0, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=route,*"), null).size());
-        assertEquals(0, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=processor,*"), null).size());
+        assertEquals(0, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=routes,*"), null).size());
+        assertEquals(0, mbsc.queryNames(new ObjectName("org.apache.camel" + ":type=processors,*"), null).size());
     }
 
 }