integration-test run independend from working directory

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 2f09dd2d8c61eeeb6b359a21bf9abd468ee6d3ac..bd42c10cb61f76af2809f11e6624cd075814ae99 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -10,6 +10,29 @@
   <name>UI Test Bundle</name>
   <description>Holds all Tests for the Taxonomic Editor</description>
   <build>
   <name>UI Test Bundle</name>
   <description>Holds all Tests for the Taxonomic Editor</description>
   <build>

+  <resources>
+      <resource>
+        <!-- replace the place holders like ${...} in datasources.xml -->
+        <filtering>true</filtering>
+        <directory>src/test/resources</directory>
+        <targetPath>../test-classes</targetPath>
+        <includes>
+          <include>datasources.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <!-- all other test resources without filtering -->
+        <directory>src/test/resources</directory>
+        <targetPath>../test-classes</targetPath>
+        <excludes>
+          <exclude>datasources.xml</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <!-- all main resources without filtering -->
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>

     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/datasources.xml b/eu.etaxonomy.taxeditor.test/src/test/resources/datasources.xml
index 3fd06c6b907fc85ae0ea2b40e169ebb18760fc29..32fecb6ee84794ff611e0ee9411fddfc84bf57fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/datasources.xml
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/datasources.xml
@@ -34,6 +34,6 @@
         <property name="driverClass" value="org.h2.Driver"/>
         <property name="user" value="sa" />
         <property name="password" value="" />
         <property name="driverClass" value="org.h2.Driver"/>
         <property name="user" value="sa" />
         <property name="password" value="" />

-        <property name="jdbcUrl" value="jdbc:h2:file:./target/test-classes/h2/cdmTest;AUTO_SERVER=TRUE"/>
+        <property name="jdbcUrl" value="jdbc:h2:file:${basedir}/target/test-classes/h2/cdmTest;AUTO_SERVER=TRUE"/>

     </bean>
 </beans>
\ No newline at end of file
     </bean>
 </beans>
\ No newline at end of file