svn commit: r672474 - in /activemq/camel/trunk: ./ camel-core/src/main/java/org/apache/camel/management/ components/camel-spring/src/main/java/org/apache/camel/spring/ examples/camel-example-spring-jms/

[davsclaus]

Author: davsclaus
Date: Sat Jun 28 00:57:22 2008
New Revision: 672474

URL: http://svn.apache.org/viewvc?rev=672474&view=rev
Log:
CAMEL-637: Applied patch with thanks to William Tam (fixed registration of 
mbeans). Upgraded to Spring 2.5.5.

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
    
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java
    activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml
    activemq/camel/trunk/pom.xml

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java?rev=672474&r1=672473&r2=672474&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
 Sat Jun 28 00:57:22 2008
@@ -232,7 +232,11 @@
         }
 
         if (instance != null) {
-            mbeans.add(name);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Registered objectname " + instance.getObjectName());
+            }
+            
+            mbeans.add(instance.getObjectName());
         }
     }
 
@@ -287,6 +291,10 @@
             (List<MBeanServer>)MBeanServerFactory.findMBeanServer(null);
 
         for (MBeanServer server : servers) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Found MBeanServer with default domain " + 
server.getDefaultDomain());
+            }
+            
             if (mBeanServerDefaultDomain.equals(server.getDefaultDomain())) {
                 return server;
             }
@@ -300,7 +308,7 @@
         try {
             LocateRegistry.createRegistry(registryPort);
             if (LOG.isDebugEnabled()) {
-                LOG.debug("created RMI regisry on port " + registryPort);
+                LOG.debug("Created RMI regisry on port " + registryPort);
             }
         } catch (RemoteException ex) {
             // The registry may had been created, we could get the registry 
instead

Modified: 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java?rev=672474&r1=672473&r2=672474&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java
 Sat Jun 28 00:57:22 2008
@@ -109,7 +109,7 @@
         return mbeanObjectDomainName;
     }
     
-    public void getMbeanObjectDomainName(String value) {
+    public void setMbeanObjectDomainName(String value) {
         mbeanObjectDomainName = value;
     }
     
@@ -117,7 +117,7 @@
         return serviceUrlPath;
     }
     
-    public void getServiceUrlPath(String value) {
+    public void setServiceUrlPath(String value) {
         serviceUrlPath = value;
     }
 
@@ -145,5 +145,4 @@
         disabled = value;
     }
     
-    
 }

Modified: activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=672474&r1=672473&r2=672474&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml Sat Jun 28 
00:57:22 2008
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>2.5.4</version>
+            <version>2.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>

Modified: activemq/camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=672474&r1=672473&r2=672474&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Sat Jun 28 00:57:22 2008
@@ -45,7 +45,7 @@
     <jetty-version>6.1.9</jetty-version>
     <slf4j-version>1.3.0</slf4j-version>
     <openjpa-version>1.1.0</openjpa-version>
-    <spring-version>2.5.4</spring-version>
+    <spring-version>2.5.5</spring-version>
     <spring-osgi-version>1.0.2</spring-osgi-version>
     <mina-version>1.1.7</mina-version>
     <uface-version>1.0-m1</uface-version>