svn commit: r663912 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/component/bean/BeanProcessor.java test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java

[davsclaus]

Author: davsclaus
Date: Fri Jun  6 05:27:01 2008
New Revision: 663912

URL: http://svn.apache.org/viewvc?rev=663912&view=rev
Log:
CAMEL-584: Avoid cycle dependency. Reference to bean is now a BeanHolder and 
they propery key has changed.

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=663912&r1=663911&r2=663912&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
 Fri Jun  6 05:27:01 2008
@@ -71,7 +71,7 @@
         }
 
         Object bean = beanHolder.getBean();
-        exchange.setProperty("CamelBean", bean);
+        exchange.setProperty("org.apache.camel.bean.BeanHolder", beanHolder);
 
         Processor processor = getProcessor();
         BeanInfo beanInfo = beanHolder.getBeanInfo();

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java?rev=663912&r1=663911&r2=663912&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
 Fri Jun  6 05:27:01 2008
@@ -17,7 +17,6 @@
 package org.apache.camel.component.bean;
 
 import java.util.Map;
-
 import javax.naming.Context;
 
 import org.apache.camel.Body;
@@ -28,20 +27,16 @@
 import org.apache.camel.Processor;
 import org.apache.camel.Properties;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.util.jndi.JndiContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * @version $Revision$
  */
 public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends 
ContextTestSupport {
-    private static final transient Log LOG = 
LogFactory.getLog(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
 
     public void testSendMessage() throws Exception {
-        template.send("direct:in", new Processor() {
+        Exchange out = template.send("direct:in", new Processor() {
             public void process(Exchange exchange) throws Exception {
                 exchange.setProperty("p1", "abc");
                 exchange.setProperty("p2", 123);
@@ -53,6 +48,12 @@
             }
         });
 
+        assertEquals("Should not fail", false, out.isFailed());
+
+        BeanHolder holder = 
out.getProperty("org.apache.camel.bean.BeanHolder", BeanHolder.class);
+        assertNotNull("BeanHolder is missing", holder);
+        assertEquals(myBean, holder.getBean());
+
         Map foo = myBean.foo;
         Map bar = myBean.bar;
         assertNotNull("myBean.foo", foo);
@@ -82,8 +83,8 @@
     }
 
     public static class MyBean {
-        public Map foo;
-        public Map bar;
+        private Map foo;
+        private Map bar;
         private String body;
 
         @Override
@@ -95,7 +96,9 @@
             this.foo = foo;
             this.bar = bar;
             this.body = body;
-            LOG.info("myMethod() method called on " + this);
+            
+            assertNotNull(toString());
         }
     }
+    
 }
\ No newline at end of file