[Openutils-svn] SF.net SVN: openutils:[4095] branches/openutils-bshd5-backport

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

Revision: 4095
          http://openutils.svn.sourceforge.net/openutils/?rev=4095&view=rev
Author:   gcatania
Date:     2012-07-05 15:05:00 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Merged revisions 4091-4092 via svnmerge from 
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5

........
  r4091 | gcatania | 2012-07-05 16:42:38 +0200 (Thu, 05 Jul 2012) | 1 line
  
  BSHD-17 preliminary: avoid possible sql keywords as field names
........
  r4092 | gcatania | 2012-07-05 16:49:05 +0200 (Thu, 05 Jul 2012) | 1 line
  
  BSHD-17 added derby profile for unit tests
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4091&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4092&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java
    branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml

Property Changed:
----------------
    branches/openutils-bshd5-backport/
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/


Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/openutils-bshd5:1-4040,4042-4056,4058-4089
   + /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*
   + /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*

Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/pom.xml	2012-07-05 15:05:00 UTC (rev 4095)
@@ -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>
@@ -159,12 +165,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.annotations.version}</version>
@@ -192,4 +192,61 @@
     <hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
     <javassist.version>3.14.0-GA</javassist.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>


Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089
   + /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092


Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089
   + /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2012-07-05 15:05:00 UTC (rev 4095)
@@ -115,7 +115,7 @@
         CarModel prius = new CarModel();
         prius.setName("Prius");
         prius.setMake(toyota);
-        prius.setYear(Integer.valueOf(2008));
+        prius.setLaunchYear(Integer.valueOf(2008));
 
         List<CarModel> toyotaModels = toyota.getModels();
         if (toyotaModels == null)

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-07-05 15:05:00 UTC (rev 4095)
@@ -128,7 +128,7 @@
         Assert.assertEquals(rd.getEmployer(), toyota);
         Assert.assertEquals(prius.getMake(), toyota);
         Assert.assertEquals(rd.getHipsterFactor(), 97);
-        Assert.assertEquals(rd.getDesignedModels().iterator().next().getYear(), Integer.valueOf(2008));
+        Assert.assertEquals(rd.getDesignedModels().iterator().next().getLaunchYear(), Integer.valueOf(2008));
     }
 
     @Test

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java	2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java	2012-07-05 15:05:00 UTC (rev 4095)
@@ -47,7 +47,7 @@
     private String street;
 
     @Column(nullable = false, scale = 4)
-    private Integer no;
+    private Integer streetNumber;
 
     @Column(nullable = false, length = 50)
     private String city;
@@ -62,10 +62,10 @@
     {
     }
 
-    public Address(String street, Integer no, String city, String county, Integer zipCode)
+    public Address(String street, Integer streetNumber, String city, String county, Integer zipCode)
     {
         this.street = street;
-        this.no = no;
+        this.streetNumber = streetNumber;
         this.city = city;
         this.county = county;
         this.zipCode = zipCode;
@@ -104,19 +104,19 @@
     }
 
     /**
-     * @return the no
+     * @return the streetNumber
      */
-    public Integer getNo()
+    public Integer getStreetNumber()
     {
-        return no;
+        return streetNumber;
     }
 
     /**
-     * @param no the no to set
+     * @param streetNumber the no to set
      */
-    public void setNo(Integer no)
+    public void setStreetNumber(Integer streetNumber)
     {
-        this.no = no;
+        this.streetNumber = streetNumber;
     }
 
     /**
@@ -178,7 +178,7 @@
         result = prime * result + ((city == null) ? 0 : city.hashCode());
         result = prime * result + ((county == null) ? 0 : county.hashCode());
         result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + ((no == null) ? 0 : no.hashCode());
+        result = prime * result + ((streetNumber == null) ? 0 : streetNumber.hashCode());
         result = prime * result + ((street == null) ? 0 : street.hashCode());
         result = prime * result + ((zipCode == null) ? 0 : zipCode.hashCode());
         return result;
@@ -236,14 +236,14 @@
         {
             return false;
         }
-        if (no == null)
+        if (streetNumber == null)
         {
-            if (other.no != null)
+            if (other.streetNumber != null)
             {
                 return false;
             }
         }
-        else if (!no.equals(other.no))
+        else if (!streetNumber.equals(other.streetNumber))
         {
             return false;
         }
@@ -284,8 +284,8 @@
             + county
             + ", id="
             + id
-            + ", no="
-            + no
+            + ", streetNumber="
+            + streetNumber
             + ", street="
             + street
             + ", zipCode="

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java	2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java	2012-07-05 15:05:00 UTC (rev 4095)
@@ -52,7 +52,7 @@
     private String name;
 
     @Column
-    private Integer year;
+    private Integer launchYear;
 
     /**
      * @return the id
@@ -103,19 +103,19 @@
     }
 
     /**
-     * @return the year
+     * @return the launchYear
      */
-    public Integer getYear()
+    public Integer getLaunchYear()
     {
-        return year;
+        return launchYear;
     }
 
     /**
-     * @param year the year to set
+     * @param launchYear the launchYear to set
      */
-    public void setYear(Integer year)
+    public void setLaunchYear(Integer launchYear)
     {
-        this.year = year;
+        this.launchYear = launchYear;
     }
 
     /**
@@ -129,7 +129,7 @@
         result = prime * result + ((id == null) ? 0 : id.hashCode());
         result = prime * result + ((make == null) ? 0 : make.hashCode());
         result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((year == null) ? 0 : year.hashCode());
+        result = prime * result + ((launchYear == null) ? 0 : launchYear.hashCode());
         return result;
     }
 
@@ -185,14 +185,14 @@
         {
             return false;
         }
-        if (year == null)
+        if (launchYear == null)
         {
-            if (other.year != null)
+            if (other.launchYear != null)
             {
                 return false;
             }
         }
-        else if (!year.equals(other.year))
+        else if (!launchYear.equals(other.launchYear))
         {
             return false;
         }
@@ -211,8 +211,8 @@
             .append(id)
             .append(", name=")
             .append(name)
-            .append(", year=")
-            .append(year)
+            .append(", launchYear=")
+            .append(launchYear)
             .append("]");
         return builder.toString();
     }

Modified: branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml
===================================================================
--- branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml	2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml	2012-07-05 15:05:00 UTC (rev 4095)
@@ -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.