svn commit: r1310727 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/test/java/org/apache/camel/ camel-core/src/test/java/org/apache/camel/impl/

[davsclaus]

Author: davsclaus
Date: Sat Apr  7 10:38:47 2012
New Revision: 1310727

URL: http://svn.apache.org/viewvc?rev=1310727&view=rev
Log:
CAMEL-5149: The default injector should perform bean post processing to setup 
@Produce and the likes on the bean

Added:
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultInjector.java
      - copied unchanged from r1310724, 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInjector.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/InjectorDefaultsTest.java
      - copied unchanged from r1310724, 
camel/trunk/camel-core/src/test/java/org/apache/camel/InjectorDefaultsTest.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
      - copied unchanged from r1310724, 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
Removed:
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/InjectorDefaultsToReflectionTest.java
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1310724

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1310727&r1=1310726&r2=1310727&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 Sat Apr  7 10:38:47 2012
@@ -119,7 +119,6 @@ import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.EventHelper;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ReflectionInjector;
 import org.apache.camel.util.ServiceHelper;
 import org.apache.camel.util.StopWatch;
 import org.apache.camel.util.TimeUtils;
@@ -2069,8 +2068,8 @@ public class DefaultCamelContext extends
         try {
             return (Injector) finder.newInstance("Injector");
         } catch (NoFactoryAvailableException e) {
-            // lets use the default
-            return new ReflectionInjector();
+            // lets use the default injector
+            return new DefaultInjector(this);
         }
     }