Updated Branches: refs/heads/master 1987b012c -> b72f9c0ee
[CAMEL-7126] Fixed BAM example compilation errors. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b72f9c0e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b72f9c0e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b72f9c0e Branch: refs/heads/master Commit: b72f9c0ee2fd3570f490f0dca0f8538f0c607bba Parents: 1987b01 Author: Henryk Konsek <hekon...@gmail.com> Authored: Tue Jan 28 07:49:02 2014 +0100 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Tue Jan 28 07:49:02 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/example/bam/MyActivities.java | 7 ++++--- .../src/main/resources/META-INF/spring/camel-context.xml | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b72f9c0e/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java b/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java index 8cc728a..6ed3db5 100644 --- a/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java +++ b/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java @@ -16,9 +16,10 @@ */ package org.apache.camel.example.bam; +import javax.persistence.EntityManagerFactory; + import org.apache.camel.bam.ActivityBuilder; import org.apache.camel.bam.ProcessBuilder; -import org.springframework.orm.jpa.JpaTemplate; import org.springframework.transaction.support.TransactionTemplate; import static org.apache.camel.util.Time.seconds; @@ -32,8 +33,8 @@ public class MyActivities extends ProcessBuilder { public MyActivities() { } - public MyActivities(JpaTemplate jpaTemplate, TransactionTemplate transactionTemplate) { - super(jpaTemplate, transactionTemplate); + public MyActivities(EntityManagerFactory entityManagerFactory, TransactionTemplate transactionTemplate) { + super(entityManagerFactory, transactionTemplate); } public void configure() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/b72f9c0e/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml index e0fbdde..0608aa6 100644 --- a/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml +++ b/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml @@ -30,7 +30,7 @@ <!-- the builder with our activities --> <bean id="activities" class="org.apache.camel.example.bam.MyActivities"> - <property name="jpaTemplate" ref="jpaTemplate"/> + <property name="entityManagerFactory" ref="entityManagerFactory"/> <property name="transactionTemplate" ref="transactionTemplate"/> </bean> @@ -42,10 +42,6 @@ </property> </bean> - <bean id="jpaTemplate" class="org.springframework.orm.jpa.JpaTemplate"> - <property name="entityManagerFactory" ref="entityManagerFactory"/> - </bean> - <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <property name="persistenceUnitName" value="bam"/> <property name="jpaVendorAdapter" ref="jpaAdapter"/>
