camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject svn commit: r1344025 - 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
Date Tue, 29 May 2012 22:03:48 GMT
Author: cmueller
Date: Tue May 29 22:03:48 2012
New Revision: 1344025

URL: http://svn.apache.org/viewvc?rev=1344025&view=rev
Log:
CAMEL-4734: Consolidate the database vendors in our unit tests

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=1344025&r1=1344024&r2=1344025&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Tue May 29 22:03:48 2012
@@ -84,8 +84,8 @@
       <artifactId>hibernate</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -106,7 +106,20 @@
 
   <build>
     <plugins>
-
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+          <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+          <systemProperties>
+            <property>
+              <name>derby.stream.error.file</name>
+              <value>target/derby.log</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      
       <!-- Allows the example to be run via 'mvn camel:run' -->
       <plugin>
         <groupId>org.apache.camel</groupId>

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=1344025&r1=1344024&r2=1344025&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 Tue
May 29 22:03:48 2012
@@ -25,15 +25,8 @@
     <class>org.apache.camel.bam.model.ProcessInstance</class>
 
     <properties>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+      <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
 	  <property name="hibernate.hbm2ddl.auto" value="create"/>
-
-      <!-- debugging flags -->
-<!--
-      <property name="hibernate.show_sql" value="true"/>
-      <property name="hibernate.format_sql" value="true"/>
--->
     </properties>
-
   </persistence-unit>
 </persistence>

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=1344025&r1=1344024&r2=1344025&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
Tue May 29 22:03:48 2012
@@ -53,15 +53,12 @@
   </bean>
 
   <bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-    <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect"/>
+    <property name="databasePlatform" value="org.hibernate.dialect.DerbyDialect"/>
   </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=""/>
+    <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+    <property name="url" value="jdbc:derby:target/test/database;create=true"/>
   </bean>
-
 </beans>



Mime
View raw message