From 20496293544aded6e622fc8a5ed54e30dfb26aae Mon Sep 17 00:00:00 2001
From: Javier Moran Rua <jmoran@igalia.com>
Date: Fri, 2 Oct 2009 21:12:01 +0200
Subject: [PATCH] ItEr28S13MontaxeProbasUnidadeItEr19S05:Added resource
 filtering to adapt table names to different DBMS

---
 navalplanner-business/src/test/resources/dbunit-data.xml | 2 +-
 pom.xml                                                  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/test/resources/dbunit-data.xml b/navalplanner-business/src/test/resources/dbunit-data.xml
index bba84b74b..fe8a0dc58 100644
--- a/navalplanner-business/src/test/resources/dbunit-data.xml
+++ b/navalplanner-business/src/test/resources/dbunit-data.xml
@@ -8,7 +8,7 @@
     <!-- these values to be present in the database.                          -->
     <!-- ==================================================================== -->
 
-    <table name="public.advancetype">
+    <table name="${databasetable.prefix}advancetype">
 
         <column>id</column>
         <column>version</column>
diff --git a/pom.xml b/pom.xml
index 246d83878..b0c2b1a5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
         <dataSource.jndiName>jdbc/navalplanner-ds</dataSource.jndiName>
         <testDataSource.user>${dataSource.user}</testDataSource.user>
         <testDataSource.password>${dataSource.password}</testDataSource.password>
+        <databasetable.prefix>public.</databasetable.prefix>
     </properties>
 
     <!--
@@ -115,6 +116,7 @@
                 <testDataSource.url>${dataSource.url}test</testDataSource.url>
                 <!-- Hibernate properties -->
                 <hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</hibernate.dialect>
+                <databasetable.prefix>public.</databasetable.prefix>
             </properties>
         </profile>
 
@@ -132,6 +134,7 @@
                 <testDataSource.url>${dataSource.url}test</testDataSource.url>
                 <!-- Hibernate properties -->
                 <hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</hibernate.dialect>
+                <databasetable.prefix></databasetable.prefix>
             </properties>
         </profile>
 
@@ -151,6 +154,7 @@
                 <testDataSource.url>jdbc:hsqldb:target/hsqldb/naval${navalplanner.mode}test;shutdown=true</testDataSource.url>
                 <!-- Hibernate properties -->
                 <hibernate.dialect>org.hibernate.dialect.HSQLDialect</hibernate.dialect>
+                <databasetable.prefix></databasetable.prefix>
             </properties>
         </profile>
 
@@ -436,6 +440,7 @@
                 <includes>
                     <include>*spring-config-test.xml</include>
                     <include>*hibernate-test.cfg.xml</include>
+                    <include>**/dbunit*.xml</include>
                 </includes>
             </testResource>