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/12/14 11:00:18 UTC

svn commit: r890255 - in /camel/trunk/examples/camel-example-bam: pom.xml src/main/resources/META-INF/persistence.xml src/main/resources/META-INF/spring/camel-context.xml

Author: ningjiang
Date: Mon Dec 14 10:00:18 2009
New Revision: 890255

URL: http://svn.apache.org/viewvc?rev=890255&view=rev
Log:
CAMEL-2283 camel-example-bam can be deploied into ServiceMix now

Modified:
    camel/trunk/examples/camel-example-bam/pom.xml
    camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
    camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml

Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=890255&r1=890254&r2=890255&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Mon Dec 14 10:00:18 2009
@@ -36,6 +36,11 @@
      <camel.osgi.export.pkg>
      	org.apache.camel.example.bam.*
      </camel.osgi.export.pkg>
+     <camel.osgi.import.additional>
+        org.apache.camel.bam.model
+     </camel.osgi.import.additional>
+     <!-- to avoid us import bunch other package -->
+	 <camel.osgi.dynamic>*</camel.osgi.dynamic>
   </properties>
 
   <dependencies>
@@ -51,6 +56,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-juel</artifactId>
     </dependency>
+    <dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-aop</artifactId>
+	</dependency>
 
     <!-- lets use log4j -->
     <dependency>
@@ -62,6 +71,12 @@
       <artifactId>log4j</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+    </dependency>
+
     <!-- lets use hibernate by default -->
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -79,6 +94,10 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
+    <dependency>
+		<groupId>commons-dbcp</groupId>
+		<artifactId>commons-dbcp</artifactId>
+	</dependency>
 
     <!-- testing -->
     <dependency>

Modified: camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml?rev=890255&r1=890254&r2=890255&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml (original)
+++ camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml Mon Dec 14 10:00:18 2009
@@ -26,11 +26,7 @@
 
     <properties>
       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-      <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
-      <property name="hibernate.connection.username" value="sa"/>
-      <property name="hibernate.connection.password" value=""/>
-      <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:camel_bam"/>
-      <property name="hibernate.hbm2ddl.auto" value="create"/>
+	  <property name="hibernate.hbm2ddl.auto" value="create"/>
 
       <!-- debugging flags -->
 <!--

Modified: camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml?rev=890255&r1=890254&r2=890255&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml Mon Dec 14 10:00:18 2009
@@ -46,19 +46,34 @@
         <property name="entityManagerFactory" ref="entityManagerFactory"/>
     </bean>
 
-    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
+    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="persistenceUnitName" value="bam"/>
+        <property name="jpaVendorAdapter" ref="jpaAdapter"/>
+        <property name="dataSource" ref="dataSource" />
     </bean>
+    
+    <bean id="jpaAdapter"
+        class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+        <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />
+    </bean>
+  
+  <!--  DataSource Definition -->
+  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+        <property name="url" value="jdbc:hsqldb:mem:camel_bam" />
+        <property name="username" value="sa" />
+        <property name="password" value="" />
+  </bean>
 
     <!-- let's show a simple UI to browse the database -->
-    <bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner" lazy-init="false">
+    <!-- bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner" lazy-init="false">
         <property name="main" value="org.hsqldb.util.DatabaseManagerSwing"/>
         <property name="args">
             <list>
-                <value>--url</value>
+                <value>url</value>
                 <value>jdbc:hsqldb:mem:camel_bam</value>
             </list>
         </property>
         <property name="delay" value="1000"/>
-    </bean>
+    </bean-->
 </beans>