camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r672347 - in /activemq/camel/trunk: components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java examples/camel-example-spring-jms/README.txt examples/camel-example-spring-jms/pom.xml
Date Fri, 27 Jun 2008 18:03:34 GMT
Author: davsclaus
Date: Fri Jun 27 11:03:34 2008
New Revision: 672347

URL: http://svn.apache.org/viewvc?rev=672347&view=rev
Log:
Polished the code and fixed a README in an example

Modified:
    activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
    activemq/camel/trunk/examples/camel-example-spring-jms/README.txt
    activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml

Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=672347&r1=672346&r2=672347&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
(original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Fri Jun 27 11:03:34 2008
@@ -161,9 +161,11 @@
 
         if (!isJmxEnabled() || 
                 (camelJMXAgent != null && camelJMXAgent.isDisabled() != null &&
camelJMXAgent.isDisabled())) {
+            LOG.debug("JMXAgent disabled");
             getContext().setLifecycleStrategy(new DefaultLifecycleStrategy());
         } else if (camelJMXAgent != null) {
-            
+            LOG.debug("JMXAgent enabled");
+
             if (lifecycleStrategy != null) {
                 LOG.warn("lifecycleStrategy will be overriden by InstrumentationLifecycleStrategy");
             }
@@ -183,7 +185,6 @@
         if (LOG.isDebugEnabled()) {
             LOG.debug("Found JAXB created routes: " + getRoutes());
         }
-
         findRouteBuiders();
         installRoutes();
     }
@@ -311,10 +312,10 @@
 
     /**
      * This method merely retrieves the value of the "useJmx" attribute and does 
-     * not consider the "dusabled" flag in jmxAgent element.  The useJmx 
+     * not consider the "disabled" flag in jmxAgent element.  The useJmx 
      * attribute will be removed in 2.0.  Please the jmxAgent element instead.
      * 
-     * @deprecated 
+     * @deprecated Please the jmxAgent element instead. Will be removed in Camel 2.0.
      */
     public boolean isJmxEnabled() {
         return useJmx.booleanValue();
@@ -324,6 +325,9 @@
         return useJmx;
     }
 
+    /**
+     * @deprecated Please the jmxAgent element instead. Will be removed in Camel 2.0.
+     */
     public void setUseJmx(Boolean useJmx) {
         this.useJmx = useJmx;
     }

Modified: activemq/camel/trunk/examples/camel-example-spring-jms/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/README.txt?rev=672347&r1=672346&r2=672347&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-jms/README.txt (original)
+++ activemq/camel/trunk/examples/camel-example-spring-jms/README.txt Fri Jun 27 11:03:34
2008
@@ -25,9 +25,10 @@
 You will need to compile this example first:
   mvn compile
 
-The example should run if you type
+The example should run if you type:
   mvn exec:java -PCamelServer
   mvn exec:java -PCamelServerAOP
+
   mvn exec:java -PCamelClient
   mvn exec:java -PCamelClientRemoting
   mvn exec:java -PCamelClientEndpoint

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=672347&r1=672346&r2=672347&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml Fri Jun 27 11:03:34 2008
@@ -27,8 +27,8 @@
 
     <artifactId>camel-example-spring-jms</artifactId>
     <name>Camel :: Example :: Spring :: JMS</name>
-    <description>An example using Spring XML to talk to the JMS server from two kind
of client techniques
-        and having AOP aspect to perform audit trails using Camel for record storage
+    <description>An example using Spring XML to talk to the JMS server from different
kind of client techniques
+        and having AOP aspect to perform audit trails in the Camel Server
     </description>
 
     <dependencies>



Mime
View raw message