activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r530384 - in /activemq/camel/trunk/camel-spring/src: main/java/org/apache/camel/spring/ main/java/org/apache/camel/spring/spi/ main/java/org/apache/camel/spring/xml/ main/resources/META-INF/ main/resources/META-INF/services/org/apache/camel...
Date Thu, 19 Apr 2007 11:34:11 GMT
Author: jstrachan
Date: Thu Apr 19 04:34:08 2007
New Revision: 530384

URL: http://svn.apache.org/viewvc?view=rev&rev=530384
Log:
refactoring of the spring projet to use cleaner package names

Added:
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
  (contents, props changed)
      - copied, changed from r530368, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/BeanInjector.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java
  (contents, props changed)
      - copied, changed from r530368, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringComponentResolver.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
  (contents, props changed)
      - copied, changed from r530368, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringInjector.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionInterceptor.java
  (contents, props changed)
      - copied, changed from r530379, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringTransactionInterceptor.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderAction.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderAction.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderStatement.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderStatement.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelBeanDefinitionParser.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/CamelBeanDefinitionParser.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelNamespaceHandler.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelNamespaceHandler.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/IllegalActionException.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/IllegalActionException.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/MethodInfo.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/MethodInfo.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/RouteBuilderFactory.java
      - copied, changed from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/RouteBuilderFactory.java
    activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/xml/
    activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/xml/XmlRouteBuilderTest.java
      - copied, changed from r530368, activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/builder/SpringRouteBuilderTest.java
Removed:
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/BeanInjector.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelNamespaceHandler.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringComponentResolver.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringInjector.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringTransactionInterceptor.java
    activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/builder/
Modified:
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
    activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
    activemq/camel/trunk/camel-spring/src/main/resources/META-INF/services/org/apache/camel/TransactionInterceptor
    activemq/camel/trunk/camel-spring/src/main/resources/META-INF/spring.handlers

Modified: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?view=diff&rev=530384&r1=530383&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Thu Apr 19 04:34:08 2007
@@ -48,7 +48,7 @@
     }
 
     public Class getObjectType() {
-        return CamelContext.class;
+        return SpringCamelContext.class;
     }
 
     public boolean isSingleton() {
@@ -73,9 +73,9 @@
 
     // Properties
     //-------------------------------------------------------------------------
-    public CamelContext getContext() {
+    public CamelContext getContext() throws Exception {
         if (context == null) {
-            context = new DefaultCamelContext();
+            context = SpringCamelContext.springCamelContext(getApplicationContext());
         }
         return context;
     }

Modified: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?view=diff&rev=530384&r1=530383&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
Thu Apr 19 04:34:08 2007
@@ -18,10 +18,11 @@
 package org.apache.camel.spring;
 
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.DefaultComponentResolver;
 import org.apache.camel.spi.Injector;
 import org.apache.camel.spi.ComponentResolver;
 import org.apache.camel.CamelContext;
+import org.apache.camel.spring.spi.SpringComponentResolver;
+import org.apache.camel.spring.spi.SpringInjector;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.BeansException;

Modified: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java?view=diff&rev=530384&r1=530383&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
Thu Apr 19 04:34:08 2007
@@ -19,6 +19,7 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
+import org.apache.camel.spring.spi.SpringTransactionInterceptor;
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.support.TransactionTemplate;

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
(from r530368, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/BeanInjector.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/BeanInjector.java&r1=530368&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/BeanInjector.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
Thu Apr 19 04:34:08 2007
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.spring;
+package org.apache.camel.spring.spi;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.beans.factory.wiring.BeanConfigurerSupport;

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java
(from r530368, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringComponentResolver.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringComponentResolver.java&r1=530368&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringComponentResolver.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java
Thu Apr 19 04:34:08 2007
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.spring;
+package org.apache.camel.spring.spi;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringComponentResolver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
(from r530368, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringInjector.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringInjector.java&r1=530368&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringInjector.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
Thu Apr 19 04:34:08 2007
@@ -15,20 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.spring;
+package org.apache.camel.spring.spi;
 
 import org.apache.camel.spi.Injector;
 import org.apache.camel.impl.ReflectionInjector;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.AbstractRefreshableApplicationContext;
-import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 
-import java.util.Arrays;
-
 /**
  * A Spring implementation of {@link Injector} allowing Spring to be used to dependency inject
newly created POJOs
  *
@@ -38,7 +33,7 @@
     private static final transient Log log = LogFactory.getLog(SpringInjector.class);
 
     private final AbstractRefreshableApplicationContext applicationContext;
-    private int autowireMode = AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT;
+    private int autowireMode = AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR;
     private boolean dependencyCheck = false;
 
     public SpringInjector(AbstractRefreshableApplicationContext applicationContext) {
@@ -46,6 +41,7 @@
     }
 
     public Object newInstance(Class type) {
+        // TODO support annotations for mandatory injection points?
         return applicationContext.getBeanFactory().createBean(type, autowireMode, dependencyCheck);
     }
 

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionInterceptor.java
(from r530379, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringTransactionInterceptor.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionInterceptor.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringTransactionInterceptor.java&r1=530379&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionInterceptor.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/SpringTransactionInterceptor.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionInterceptor.java
Thu Apr 19 04:34:08 2007
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.spring;
+package org.apache.camel.spring.spi;
 
 import org.apache.camel.Processor;
 import org.apache.camel.spi.Interceptor;

Propchange: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderAction.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderAction.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderAction.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderAction.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderAction.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderAction.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderAction.java
Thu Apr 19 04:34:08 2007
@@ -1,4 +1,21 @@
-package org.apache.camel.spring.builder;
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.xml;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderStatement.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderStatement.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderStatement.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderStatement.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderStatement.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/BuilderStatement.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/BuilderStatement.java
Thu Apr 19 04:34:08 2007
@@ -1,4 +1,21 @@
-package org.apache.camel.spring.builder;
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.xml;
 
 import java.util.ArrayList;
 

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelBeanDefinitionParser.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/CamelBeanDefinitionParser.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelBeanDefinitionParser.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/CamelBeanDefinitionParser.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelBeanDefinitionParser.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/CamelBeanDefinitionParser.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelBeanDefinitionParser.java
Thu Apr 19 04:34:08 2007
@@ -1,4 +1,21 @@
-package org.apache.camel.spring.builder;
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.xml;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
@@ -56,10 +73,6 @@
 
 	/**
 	 * Use reflection to figure out what is the valid next element.
-	 * @param builder TODO
-	 * @param routeElement
-	 * 
-	 * @return
 	 */
 	private Class parseBuilderElement(Element element, Class<RouteBuilder> builder, ArrayList<BuilderAction>
actions) {
 		Class currentBuilder = builder;

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelNamespaceHandler.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelNamespaceHandler.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelNamespaceHandler.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelNamespaceHandler.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelNamespaceHandler.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/CamelNamespaceHandler.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/CamelNamespaceHandler.java
Thu Apr 19 04:34:08 2007
@@ -1,6 +1,6 @@
-package org.apache.camel.spring;
+package org.apache.camel.spring.xml;
 
-import org.apache.camel.spring.builder.CamelBeanDefinitionParser;
+import org.apache.camel.spring.xml.CamelBeanDefinitionParser;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class CamelNamespaceHandler extends NamespaceHandlerSupport {

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/IllegalActionException.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/IllegalActionException.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/IllegalActionException.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/IllegalActionException.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/IllegalActionException.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/IllegalActionException.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/IllegalActionException.java
Thu Apr 19 04:34:08 2007
@@ -1,4 +1,21 @@
-package org.apache.camel.spring.builder;
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.xml;
 
 public class IllegalActionException extends IllegalArgumentException {
 

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/MethodInfo.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/MethodInfo.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/MethodInfo.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/MethodInfo.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/MethodInfo.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/MethodInfo.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/MethodInfo.java
Thu Apr 19 04:34:08 2007
@@ -1,7 +1,21 @@
 /**
- * 
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.apache.camel.spring.builder;
+package org.apache.camel.spring.xml;
 
 import java.lang.reflect.Method;
 import java.util.LinkedHashMap;

Copied: activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/RouteBuilderFactory.java
(from r530286, activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/RouteBuilderFactory.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/RouteBuilderFactory.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/RouteBuilderFactory.java&r1=530286&p2=activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/RouteBuilderFactory.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/builder/RouteBuilderFactory.java
(original)
+++ activemq/camel/trunk/camel-spring/src/main/java/org/apache/camel/spring/xml/RouteBuilderFactory.java
Thu Apr 19 04:34:08 2007
@@ -1,4 +1,21 @@
-package org.apache.camel.spring.builder;
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.xml;
 
 import java.util.ArrayList;
 
@@ -8,6 +25,11 @@
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.FactoryBean;
 
+/**
+ * A {@link FactoryBean} which creates a RouteBuilder by parsing an XML file
+ *
+ * @version $Revision: 521369 $
+ */
 public class RouteBuilderFactory implements FactoryBean, BeanFactoryAware {
 	private ArrayList<BuilderStatement> routes;
 	private boolean singleton;

Modified: activemq/camel/trunk/camel-spring/src/main/resources/META-INF/services/org/apache/camel/TransactionInterceptor
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/resources/META-INF/services/org/apache/camel/TransactionInterceptor?view=diff&rev=530384&r1=530383&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/resources/META-INF/services/org/apache/camel/TransactionInterceptor
(original)
+++ activemq/camel/trunk/camel-spring/src/main/resources/META-INF/services/org/apache/camel/TransactionInterceptor
Thu Apr 19 04:34:08 2007
@@ -1 +1 @@
-class=org.apache.camel.spring.SpringTransactionInterceptor
\ No newline at end of file
+class=org.apache.camel.spring.spi.SpringTransactionInterceptor
\ No newline at end of file

Modified: activemq/camel/trunk/camel-spring/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/main/resources/META-INF/spring.handlers?view=diff&rev=530384&r1=530383&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/main/resources/META-INF/spring.handlers (original)
+++ activemq/camel/trunk/camel-spring/src/main/resources/META-INF/spring.handlers Thu Apr
19 04:34:08 2007
@@ -1 +1 @@
-http\://activemq.apache.org/camel/schema/camel-1.0.xsd=org.apache.camel.spring.CamelNamespaceHandler
\ No newline at end of file
+http\://activemq.apache.org/camel/schema/camel-1.0.xsd=org.apache.camel.spring.xml.CamelNamespaceHandler
\ No newline at end of file

Copied: activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/xml/XmlRouteBuilderTest.java
(from r530368, activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/builder/SpringRouteBuilderTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/xml/XmlRouteBuilderTest.java?view=diff&rev=530384&p1=activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/builder/SpringRouteBuilderTest.java&r1=530368&p2=activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/xml/XmlRouteBuilderTest.java&r2=530384
==============================================================================
--- activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/builder/SpringRouteBuilderTest.java
(original)
+++ activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/xml/XmlRouteBuilderTest.java
Thu Apr 19 04:34:08 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.spring.builder;
+package org.apache.camel.spring.xml;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -29,7 +29,7 @@
  * 
  * @version $Revision: 520164 $
  */
-public class SpringRouteBuilderTest extends RouteBuilderTest {
+public class XmlRouteBuilderTest extends RouteBuilderTest {
 	private ClassPathXmlApplicationContext ctx;
 
 	@Override



Mime
View raw message