[lambico] push by lucio.be...@gmail.com - Updated to Hibernate 3.6.2.... on 2011-03-21 09:06 GMT

1 view

Skip to first unread message

lam...@googlecode.com

unread,

Mar 21, 2011, 5:07:00 AM3/21/11

to lambico...@googlegroups.com

Revision: 4e06bf6f70bf
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Mon Mar 21 02:05:37 2011
Log: Updated to Hibernate 3.6.2.
Updated to Spring 3.0.5.
http://code.google.com/p/lambico/source/detail?r=4e06bf6f70bf

Modified:
/lambico-spring-hibernate/pom.xml

/lambico-spring-hibernate/src/test/java/org/lambico/spring/dao/hibernate/HibernateGenericDaoTest.java

/lambico-spring-hibernate/src/test/java/org/lambico/spring/dao/hibernate/dao/EntityTCDao.java
/lambico-spring/pom.xml
/lambico-test/pom.xml

/lambico-test/src/main/java/org/lambico/test/spring/hibernate/FixtureHelper.java
/pom.xml

=======================================
--- /lambico-spring-hibernate/pom.xml Tue Jan 25 06:05:41 2011
+++ /lambico-spring-hibernate/pom.xml Mon Mar 21 02:05:37 2011
@@ -20,7 +20,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>1.8.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -52,11 +52,13 @@
<artifactId>hibernate-core</artifactId>
<version>${lambico.hibernate.version}</version>
</dependency>
+ 
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
=======================================
---
/lambico-spring-hibernate/src/test/java/org/lambico/spring/dao/hibernate/HibernateGenericDaoTest.java
Wed Mar 2 07:25:55 2011
+++
/lambico-spring-hibernate/src/test/java/org/lambico/spring/dao/hibernate/HibernateGenericDaoTest.java
Mon Mar 21 02:05:37 2011
@@ -107,13 +107,13 @@
}

public void testCountByFieldTwo() {
- Integer result = entityTCDao.countByFieldTwo("two4");
- assertEquals(Integer.valueOf(1), result);
+ Long result = entityTCDao.countByFieldTwo("two4");
+ assertEquals(Long.valueOf(1), result);
}

public void testCountByFieldOneAndFieldThree() {
- Integer result =
this.entityTCDao.countByFieldOneAndFieldThree("one3", "7hree5");
- assertEquals(Integer.valueOf(1), result);
+ Long result =
this.entityTCDao.countByFieldOneAndFieldThree("one3", "7hree5");
+ assertEquals(Long.valueOf(1), result);
}

public void testCountByCriteria() {
=======================================
---
/lambico-spring-hibernate/src/test/java/org/lambico/spring/dao/hibernate/dao/EntityTCDao.java
Mon May 10 06:22:43 2010
+++
/lambico-spring-hibernate/src/test/java/org/lambico/spring/dao/hibernate/dao/EntityTCDao.java
Mon Mar 21 02:05:37 2011
@@ -49,8 +49,8 @@
List<EntityTC> findByOrderByFieldOne(@FirstResult int firstResult,
@MaxResults int maxResults);
List<EntityTC> searchAllOrderByFieldOne(@FirstResult int firstResult,
@MaxResults int maxResults);
Long countByFieldOne(String value);
- Integer countByFieldTwo(String two); // via instrumentation
- Integer countByFieldOneAndFieldThree(String one, String three); // via
instrumentation
+ Long countByFieldTwo(String two); // via instrumentation
+ Long countByFieldOneAndFieldThree(String one, String three); // via
instrumentation
Long maxByFieldOne(String value);
List<EntityTC> searchByFieldOneCollection(@NamedParameter("values")
Collection<String> values);
List<EntityTC> searchByFieldOneArray(@NamedParameter("values")
String[] values);
=======================================
--- /lambico-spring/pom.xml Sun Jan 2 11:21:44 2011
+++ /lambico-spring/pom.xml Mon Mar 21 02:05:37 2011
@@ -20,7 +20,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>1.8.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.8</version>
+ <version>1.6.9</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
=======================================
--- /lambico-test/pom.xml Sun Jan 2 11:21:44 2011
+++ /lambico-test/pom.xml Mon Mar 21 02:05:37 2011
@@ -64,12 +64,14 @@
<artifactId>parancoe-yaml</artifactId>
<version>2.0.2</version>
</dependency>
+ 
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
@@ -83,6 +85,12 @@
<version>1.5.8</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <artifactId>hibernate-core</artifactId>
+ <groupId>org.hibernate</groupId>
+ <type>jar</type>
+ <version>${lambico.hibernate.version}</version>
+ </dependency>
</dependencies>
</project>

=======================================
---
/lambico-test/src/main/java/org/lambico/test/spring/hibernate/FixtureHelper.java
Thu Sep 2 10:30:30 2010
+++
/lambico-test/src/main/java/org/lambico/test/spring/hibernate/FixtureHelper.java
Mon Mar 21 02:05:37 2011
@@ -252,9 +252,10 @@
}
try {
for (Object entity : fixtures) {
- dao.store(entity);
- ((GenericDaoHibernateSupport)
dao).getHibernateTemplate().flush();
- }
+ ((GenericDaoHibernateSupport)
dao).getHibernateTemplate().saveOrUpdate(entity);
+ }
+ ((GenericDaoHibernateSupport)
dao).getHibernateTemplate().flush();
+ ((GenericDaoHibernateSupport)
dao).getHibernateTemplate().clear();
} catch (Exception e) {
logger.error("Error populating rows in " + getModelName(model)
+ " table", e);
=======================================
--- /pom.xml Mon Jan 3 23:14:20 2011
+++ /pom.xml Mon Mar 21 02:05:37 2011
@@ -19,9 +19,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.basedir>${basedir}</main.basedir>
<year>2009</year>
- <lambico.spring.version>3.0.3.RELEASE</lambico.spring.version>
- <lambico.hibernate.version>3.3.2.GA</lambico.hibernate.version>
-
<lambico.hibernate-annotations.version>3.4.0.GA</lambico.hibernate-annotations.version>
+ <lambico.spring.version>3.0.5.RELEASE</lambico.spring.version>
+ <lambico.hibernate.version>3.6.2.Final</lambico.hibernate.version>
+
<lambico.hibernate-annotations.version>3.5.1-Final</lambico.hibernate-annotations.version>
<lambico.log4j.version>1.2.14</lambico.log4j.version>
<lambico.junit4.version>4.4</lambico.junit4.version>

@@ -184,7 +184,7 @@
<repository>
<id>jboss-maven2-repository</id>
<name>JBoss Repository for Maven</name>
-
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>

Reply all

Reply to author

Forward

0 new messages