svn commit: r722883 - in /activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig: CamelConfiguration.java SingleRouteCamelConfiguration.java

[jstrachan]

Author: jstrachan
Date: Wed Dec  3 05:29:42 2008
New Revision: 722883

URL: http://svn.apache.org/viewvc?rev=722883&view=rev
Log:
tidied up the code a little removing some cruft

Modified:
    
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
    
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java

Modified: 
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java?rev=722883&r1=722882&r2=722883&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
 Wed Dec  3 05:29:42 2008
@@ -46,27 +46,8 @@
 
         CamelContext camelContext = getBean(CamelContext.class);
         // lets lookup a bean
-        answer.setCamelContext((SpringCamelContext) camelContext);
+        answer.setCamelContext(camelContext);
         return answer;
-/*
-        {
-            @Override
-            public Object postProcessAfterInitialization(Object bean, String 
beanName) throws BeansException {
-                try {
-                    SpringCamelContext context = (SpringCamelContext) 
getCamelContext();
-                    if (context == null) {
-                        // we have not yet injected the context so lets set it
-                        setCamelContext(camelContext());
-                    }
-                    return super.postProcessAfterInitialization(bean, 
beanName);
-                } catch (BeansException e) {
-                    throw e;
-                } catch (Exception e) {
-                    throw new BeanInitializationException(e.getMessage(), e);
-                }
-            }
-        };
-*/
     }
 
     /**
@@ -86,7 +67,6 @@
     /**
      * Returns the list of routes to use in this configuration
      */
-    //@Bean
     public abstract List<RouteBuilder> routes();
 
 }

Modified: 
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java?rev=722883&r1=722882&r2=722883&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java
 Wed Dec  3 05:29:42 2008
@@ -33,7 +33,7 @@
  * @version $Revision: 1.1 $
  */
 public abstract class SingleRouteCamelConfiguration extends CamelConfiguration 
{
-    //@Bean
+    @Bean
     public List<RouteBuilder> routes() {
         return Collections.singletonList(route());
     }
@@ -42,6 +42,5 @@
      * Creates the single [EMAIL PROTECTED] RouteBuilder} to use in this 
confguration
      * @return
      */
-    //@Bean
     public abstract RouteBuilder route();
 }