[Openutils-svn] SF.net SVN: openutils:[4092] trunk/openutils-bshd5

[<gca...@us...>]

Revision: 4092
          http://openutils.svn.sourceforge.net/openutils/?rev=4092&view=rev
Author:   gcatania
Date:     2012-07-05 14:49:05 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-17 added derby profile for unit tests

Modified Paths:
--------------
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-bshd5/src/test/resources/spring-tests.xml

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2012-07-05 14:42:38 UTC (rev 4091)
+++ trunk/openutils-bshd5/pom.xml	2012-07-05 14:49:05 UTC (rev 4092)
@@ -29,6 +29,12 @@
     <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
   </scm>
   <build>
+    <testResources>
+      <testResource>
+        <filtering>true</filtering>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -142,12 +148,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>2.2.6</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
       <version>${hibernate.version}</version>
@@ -174,4 +174,61 @@
     <javassist.version>3.16.1-GA</javassist.version>
     <spring.version>3.0.0.RELEASE</spring.version>
   </properties>
+
+  <profiles>
+    <profile>
+      <id>test-hsql</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <hibernate.driver>org.hsqldb.jdbcDriver</hibernate.driver>
+        <hibernate.url>jdbc:hsqldb:mem:daotest</hibernate.url>
+        <hibernate.user>sa</hibernate.user>
+        <hibernate.password></hibernate.password>
+        <hibernate.dialect>org.hibernate.dialect.HSQLDialect</hibernate.dialect>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+          <version>2.2.8</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>test-derby</id>
+      <properties>
+        <hibernate.driver>org.apache.derby.jdbc.EmbeddedDriver</hibernate.driver>
+        <hibernate.url>jdbc:derby:memory:daotest;create=true</hibernate.url>
+        <hibernate.user>sa</hibernate.user>
+        <hibernate.password></hibernate.password>
+        <hibernate.dialect>org.hibernate.dialect.DerbyDialect</hibernate.dialect>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>derby.stream.error.file</name>
+                  <value>${project.build.directory}/derby.log</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.derby</groupId>
+          <artifactId>derby</artifactId>
+          <version>10.9.1.0</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

Modified: trunk/openutils-bshd5/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-bshd5/src/test/resources/spring-tests.xml	2012-07-05 14:42:38 UTC (rev 4091)
+++ trunk/openutils-bshd5/src/test/resources/spring-tests.xml	2012-07-05 14:49:05 UTC (rev 4092)
@@ -11,10 +11,10 @@
   <context:annotation-config />
   <context:component-scan base-package="it.openutils.hibernate.test" />
   <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:daotest" />
-    <property name="username" value="sa" />
-    <property name="password" value="" />
+    <property name="driverClassName" value="${hibernate.driver}" />
+    <property name="url" value="${hibernate.url}" />
+    <property name="username" value="${hibernate.user}" />
+    <property name="password" value="${hibernate.password}" />
   </bean>
   <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
     <property name="dataSource" ref="dataSource" />
@@ -22,7 +22,7 @@
     <property name="configurationClass" value="org.hibernate.cfg.AnnotationConfiguration" />
     <property name="hibernateProperties">
       <props>
-        <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
+        <prop key="hibernate.dialect">${hibernate.dialect}</prop>
         <prop key="hibernate.show_sql">true</prop>
         <prop key="hibernate.hbm2ddl.auto">create-drop</prop>
       </props>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.