You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/16 20:48:04 UTC

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

Author: jstrachan
Date: Thu Aug 16 11:48:00 2007
New Revision: 566799

URL: http://svn.apache.org/viewvc?view=rev&rev=566799
Log:
test cases to prove CAMEL-108 works

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
    activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java?view=diff&rev=566799&r1=566798&r2=566799
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java Thu Aug 16 11:48:00 2007
@@ -16,16 +16,22 @@
  */
 package org.apache.camel;
 
+import org.apache.camel.spi.Registry;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Used to indicate an injection point of an {@link Endpoint} or {@link Producer} in a POJO.
- * Either a <a href="http://activemq.apache.org/camel/uris.html">URI</a> for an endpoint
- * should be configured, or a name of an endpoint
- * which refers to a Spring bean name in your Spring ApplicationContext.
+ * Used to indicate an injection point of an {@link Endpoint}, {@link Producer},
+ * {@link ProducerTemplate} or {@link CamelTemplate} into a POJO.
+ *
+ * A <a href="http://activemq.apache.org/camel/uris.html">URI</a> for an endpoint
+ * can be specified on this annotation, or a name can be specified which is resolved in the
+ * {@link Registry} such as in your Spring ApplicationContext.
+ *
+ * If no name or uri is specified then the name is defaulted from the field, property or method name.
  *
  * @version $Revision: 523756 $
  */

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java?view=diff&rev=566799&r1=566798&r2=566799
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java Thu Aug 16 11:48:00 2007
@@ -20,6 +20,7 @@
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Producer;
+import org.apache.camel.ProducerTemplate;
 
 /**
  * @version $Revision: $
@@ -37,6 +38,10 @@
     private CamelTemplate fieldInjectedCamelTemplate;
     private CamelTemplate propertyInjectedCamelTemplate;
 
+    @EndpointInject
+    private ProducerTemplate injectByFieldName;
+    private ProducerTemplate injectByPropertyName;
+
 
     // Endpoint
     //-----------------------------------------------------------------------
@@ -82,5 +87,25 @@
     @EndpointInject(uri = "direct:propertyInjectedCamelTemplate")
     public void setPropertyInjectedCamelTemplate(CamelTemplate propertyInjectedCamelTemplate) {
         this.propertyInjectedCamelTemplate = propertyInjectedCamelTemplate;
+    }
+
+    // ProducerTemplate
+    //-------------------------------------------------------------------------
+
+    public ProducerTemplate getInjectByFieldName() {
+        return injectByFieldName;
+    }
+
+    public void setInjectByFieldName(ProducerTemplate injectByFieldName) {
+        this.injectByFieldName = injectByFieldName;
+    }
+
+    public ProducerTemplate getInjectByPropertyName() {
+        return injectByPropertyName;
+    }
+
+    @EndpointInject
+    public void setInjectByPropertyName(ProducerTemplate injectByPropertyName) {
+        this.injectByPropertyName = injectByPropertyName;
     }
 }

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java?view=diff&rev=566799&r1=566798&r2=566799
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java Thu Aug 16 11:48:00 2007
@@ -42,6 +42,9 @@
 
         assertNotNull("No CamelTemplate injected for getFieldInjectedCamelTemplate()", bean.getFieldInjectedCamelTemplate());
         assertNotNull("No CamelTemplate injected for getPropertyInjectedCamelTemplate()", bean.getPropertyInjectedCamelTemplate());
+
+        assertNotNull("No ProducerTemplate injected for getInjectByFieldName()", bean.getInjectByFieldName());
+        assertNotNull("No ProducerTemplate injected for getInjectByPropertyName()", bean.getInjectByPropertyName());
     }
 
     @Override

Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml?view=diff&rev=566799&r1=566798&r2=566799
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBean.xml Thu Aug 16 11:48:00 2007
@@ -25,6 +25,8 @@
   <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
     <beanPostProcessor/>
     <endpoint id="namedEndpoint1" uri="direct:namedEndpoint1"/>
+    <endpoint id="injectByFieldName" uri="direct:injectByFieldName"/>
+    <endpoint id="injectByPropertyName" uri="direct:injectByPropertyName"/>
   </camelContext>
 
   <bean id="injectedBean" class="org.apache.camel.spring.InjectedBean"/>