You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/03/06 05:41:08 UTC
svn commit: r750767 - in /camel/branches/camel-1.x: ./
components/camel-spring/src/main/java/org/apache/camel/spring/
components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/
components/camel-spring/src/test/java/org/apache/camel/spri...
Author: ningjiang
Date: Fri Mar 6 04:41:07 2009
New Revision: 750767
URL: http://svn.apache.org/viewvc?rev=750767&view=rev
Log:
Merged revisions 750761 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r750761 | ningjiang | 2009-03-06 11:44:57 +0800 (Fri, 06 Mar 2009) | 1 line
CAMEL-1426 Fixed the issue of SpringRouteBuilder loading from Spring configuration
........
Added:
camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
- copied unchanged from r750761, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/
- copied from r750761, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/
camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
- copied unchanged from r750761, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml
- copied, changed from r750761, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 6 04:41:07 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749956,750017,750334
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749956,750017,750334,750761
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java?rev=750767&r1=750766&r2=750767&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java (original)
+++ camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java Fri Mar 6 04:41:07 2009
@@ -17,11 +17,13 @@
package org.apache.camel.spring;
import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
import org.apache.camel.spring.spi.TransactionInterceptor;
import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
import org.springframework.transaction.support.TransactionTemplate;
/**
@@ -30,7 +32,7 @@
*
* @version $Revision$
*/
-public abstract class SpringRouteBuilder extends RouteBuilder {
+public abstract class SpringRouteBuilder extends RouteBuilder implements ApplicationContextAware {
private ApplicationContext applicationContext;
public TransactionInterceptor transactionInterceptor() {
@@ -95,7 +97,7 @@
/**
* Sets the application context to use to lookup beans
*/
- public void setApplicationContext(ApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
Copied: camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml (from r750761, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml?p2=camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml&r1=750761&r2=750767&rev=750767&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml (original)
+++ camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSourceWithSpringRouteBuilder.xml Fri Mar 6 04:41:07 2009
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
<import resource="transactionalClientDataSource.xml"/>
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<package>org.apache.camel.spring.interceptor.route</package>
</camelContext>