Hibernate SVN: r14812 - in entitymanager/trunk/src: test/org/hibernate/ejb/test/exception and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-06-25 06:07:04 -0400 (Wed, 25 Jun 2008)
New Revision: 14812
Added:
entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Musician.java
Modified:
entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Music.java
Log:
EJB-349
- Removed the explcit catching of the ConstraintViolationException. This means that a ConstraintViolationException gets now wrapped around a PersistenceException. We still have to wrap the exception since we don't want to throw any Hibernate specific exceptions out of the entity managet. Removing the explicit catch of ConstraintViolationException also ment that EntityExistsException will never be thrown. This should be ok since the specs only say "may be thrown".
- Added some tests
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2008-06-25 07:32:47 UTC (rev 14811)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2008-06-25 10:07:04 UTC (rev 14812)
@@ -1,3 +1,4 @@
+// $Id:$
/*
* JBoss, the OpenSource EJB server Distributable under LGPL license. See terms of license at
* gnu.org.
@@ -9,7 +10,7 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Map;
-import javax.persistence.EntityExistsException;
+
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityTransaction;
import javax.persistence.FlushModeType;
@@ -34,26 +35,24 @@
import org.hibernate.MappingException;
import org.hibernate.ObjectDeletedException;
import org.hibernate.ObjectNotFoundException;
+import org.hibernate.QueryException;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
+import org.hibernate.StaleObjectStateException;
import org.hibernate.StaleStateException;
import org.hibernate.Transaction;
-import org.hibernate.UnresolvableObjectException;
-import org.hibernate.TypeMismatchException;
-import org.hibernate.QueryException;
import org.hibernate.TransientObjectException;
-import org.hibernate.StaleObjectStateException;
-import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.TypeMismatchException;
+import org.hibernate.UnresolvableObjectException;
import org.hibernate.cfg.Environment;
import org.hibernate.ejb.transaction.JoinableCMTTransaction;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.SessionImplementor;
-import org.hibernate.exception.ConstraintViolationException;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.transaction.TransactionFactory;
-import org.hibernate.util.JTAHelper;
import org.hibernate.util.CollectionHelper;
+import org.hibernate.util.JTAHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,6 +60,7 @@
* @author <a href="mailto:gavin@hibernate.org">Gavin King</a>
* @author Emmanuel Bernard
*/
+@SuppressWarnings("unchecked")
public abstract class AbstractEntityManagerImpl implements HibernateEntityManagerImplementor, Serializable {
private static final Logger log = LoggerFactory.getLogger( AbstractEntityManagerImpl.class );
@@ -398,25 +398,6 @@
}
}
- /**
- * adjust the flush mode to match the no tx / no flush behavior
- */
- //remove
- private void adjustFlushMode() {
- Session session = getSession();
-
- boolean isTransactionActive = isTransactionInProgress();
-
- if ( isTransactionActive && session.getFlushMode() == FlushMode.MANUAL ) {
- log.debug( "Transaction activated, move to FlushMode {}", flushModeType );
- setFlushMode( flushModeType );
- }
- else if ( ! isTransactionActive && session.getFlushMode() != FlushMode.MANUAL ) {
- log.debug( "Transaction not active, move to FlushMode NEVER" );
- session.setFlushMode( FlushMode.MANUAL );
- }
- }
-
public boolean isTransactionInProgress() {
return ( (SessionImplementor) getRawSession() ).isTransactionInProgress();
}
@@ -607,10 +588,6 @@
PersistenceException pe = wrapStaleStateException( (StaleStateException) e );
throwPersistenceException( pe );
}
- else if ( e instanceof ConstraintViolationException ) {
- //FIXME this is bad cause ConstraintViolationException happens in other circumstances
- throwPersistenceException( new EntityExistsException( e ) );
- }
else if ( e instanceof ObjectNotFoundException ) {
throwPersistenceException( new EntityNotFoundException( e.getMessage() ) );
}
Property changes on: entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java 2008-06-25 07:32:47 UTC (rev 14811)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java 2008-06-25 10:07:04 UTC (rev 14812)
@@ -1,18 +1,26 @@
-//$Id: $
+// $Id:$
package org.hibernate.ejb.test.exception;
import java.util.Map;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityNotFoundException;
import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
import org.hibernate.cfg.Environment;
import org.hibernate.ejb.test.TestCase;
+import org.hibernate.exception.ConstraintViolationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Emmanuel Bernard
*/
+@SuppressWarnings("unchecked")
public class ExceptionTest extends TestCase {
+
+ private final Logger log = LoggerFactory.getLogger(ExceptionTest.class);
public void testOptimisticLockingException() throws Exception {
EntityManager em = factory.createEntityManager();
@@ -48,7 +56,7 @@
em.close();
}
}
-
+
public void testEntityNotFoundException() throws Exception {
EntityManager em = factory.createEntityManager( );
Music music = em.getReference( Music.class, new Integer(-1) );
@@ -57,12 +65,39 @@
fail("Non existent entity should raise an exception when state is accessed");
}
catch( EntityNotFoundException e ) {
- //success
+ log.debug("success");
}
finally {
em.close();
}
}
+
+ public void testConstraintViolationException() throws Exception {
+ EntityManager em = factory.createEntityManager( );
+ em.getTransaction().begin();
+ Music music = new Music();
+ music.setName( "Jazz" );
+ em.persist( music );
+ Musician lui = new Musician();
+ lui.setName("Lui Armstrong");
+ lui.setFavouriteMusic(music);
+ em.persist(lui);
+ em.getTransaction().commit();
+ try {
+ em.getTransaction().begin();
+ String hqlDelete = "delete Music where name = :name";
+ em.createQuery( hqlDelete ).setParameter( "name", "Jazz" ).executeUpdate();
+ em.getTransaction().commit();
+ fail();
+ }
+ catch( PersistenceException e ) {
+ Throwable t = e.getCause();
+ assertTrue("Should be a constraint violation", t instanceof ConstraintViolationException);
+ }
+ finally {
+ em.close();
+ }
+ }
@Override
public Map getConfig() {
@@ -73,7 +108,7 @@
public Class[] getAnnotatedClasses() {
return new Class[] {
- Music.class
+ Music.class, Musician.class
};
}
}
Property changes on: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Music.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Music.java 2008-06-25 07:32:47 UTC (rev 14811)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Music.java 2008-06-25 10:07:04 UTC (rev 14812)
@@ -1,4 +1,4 @@
-//$Id: $
+// $Id:$
package org.hibernate.ejb.test.exception;
import java.io.Serializable;
@@ -11,6 +11,7 @@
* @author Emmanuel Bernard
*/
@Entity
+@SuppressWarnings("serial")
public class Music implements Serializable {
private Integer id;
private Integer version;
@@ -32,7 +33,8 @@
this.name = name;
}
- @Version public Integer getVersion() {
+ @Version
+ public Integer getVersion() {
return version;
}
Property changes on: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Music.java
___________________________________________________________________
Name: svn:keywords
+ Id
Added: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Musician.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Musician.java (rev 0)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Musician.java 2008-06-25 10:07:04 UTC (rev 14812)
@@ -0,0 +1,48 @@
+// $Id:$
+package org.hibernate.ejb.test.exception;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Entity
+@SuppressWarnings("serial")
+public class Musician implements Serializable {
+ private Integer id;
+
+ private String name;
+
+ private Music favouriteMusic;
+
+ @Id @GeneratedValue
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @ManyToOne
+ public Music getFavouriteMusic() {
+ return favouriteMusic;
+ }
+
+ public void setFavouriteMusic(Music favouriteMusic) {
+ this.favouriteMusic = favouriteMusic;
+ }
+}
Property changes on: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/Musician.java
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
16 years, 6 months
Hibernate SVN: r14811 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-25 03:32:47 -0400 (Wed, 25 Jun 2008)
New Revision: 14811
Added:
core/tags/JBOSS_EAP_3_2_4_SP1_CP04/
Log:
JBPAPP-918 - Created tag JBOSS_EAP_3_2_4_SP1_CP04
Copied: core/tags/JBOSS_EAP_3_2_4_SP1_CP04 (from rev 14810, core/branches/Branch_3_2_4_SP1_CP)
16 years, 6 months
Hibernate SVN: r14810 - in core/branches/Branch_3_2_4_SP1_CP: lib and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-25 03:29:21 -0400 (Wed, 25 Jun 2008)
New Revision: 14810
Modified:
core/branches/Branch_3_2_4_SP1_CP/build.xml
core/branches/Branch_3_2_4_SP1_CP/changelog.txt
core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
core/branches/Branch_3_2_4_SP1_CP/readme.txt
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java
Log:
JBPAPP-918 - update version to 3.2.4.sp1.cp04
Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-06-25 05:26:15 UTC (rev 14809)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-06-25 07:29:21 UTC (rev 14810)
@@ -24,7 +24,7 @@
<property name="version.minor" value="2"/>
<property name="version.micro" value="4"/>
<property name="version.qualifier" value="sp1"/>
- <property name="version.cp" value="cp03"/>
+ <property name="version.cp" value="cp04"/>
<property name="version.full" value="${version.major}.${version.minor}.${version.micro}.${version.qualifier}.${version.cp}"/>
<property name="version.major_minor" value="${version.major}.${version.minor}"/>
<property name="fullname" value="${name}-${version.full}"/>
@@ -669,7 +669,7 @@
</jar>
</target>
- <target name="dist" depends="init,versioncheck,jar,testjar"
+ <target name="dist" depends="init,versioncheck,jar,testjar,javadoc"
description="Build everything and package">
<mkdir dir="${dir.dist}" />
Modified: core/branches/Branch_3_2_4_SP1_CP/changelog.txt
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/changelog.txt 2008-06-25 05:26:15 UTC (rev 14809)
+++ core/branches/Branch_3_2_4_SP1_CP/changelog.txt 2008-06-25 07:29:21 UTC (rev 14810)
@@ -5,9 +5,21 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
+Changes in version 3.2.4.sp1.cp04
+-------------------------------------------
-Changes in version 3.2.4.sp1.cp03 (2008.05.02)
+** Bug
+ * [JBPAPP-231] - MasterDetailTest fails against MSSQL 2005
+ * [JBPAPP-838 / HHH-957] - SubqueryExpression throws ClassCastException on DetachedCriteria subqueries
+ * [JBPAPP-859 / HBX-757] - Add output file name, delimiter, halt on error, and format options to SchemaUpdate
+ * [JBPAPP-883 / HHH-3006] - ConcurrentModificationException in AbstractBatcher results in infinite loop
+
+** Task
+ * [JBPAPP-917] - Change build.xml to target JDK 1.5
+
+Changes in version 3.2.4.sp1.cp03
-------------------------------------------
+
** Task
* [HIBERNATE-92] - Update dependencies to be consistent with EAP 4.2 CP03
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-06-25 05:26:15 UTC (rev 14809)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-06-25 07:29:21 UTC (rev 14810)
@@ -1,6 +1,6 @@
hibernate.lib=hibernate3.jar
hibernate.ignorecheck=true
-hibernate.version=3.2.4.SP1_CP03-brew
+hibernate.version=3.2.4.SP1_CP04-brew
hibernate.name=Hibernate core
hibernate.when=runtime, required
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-06-25 05:26:15 UTC (rev 14809)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-06-25 07:29:21 UTC (rev 14810)
@@ -39,7 +39,7 @@
cleanimports.name=cleanimports
cleanimports.when=buildtime
-hibernate.version=3.2.4.SP1_CP03-brew
+hibernate.version=3.2.4.SP1_CP04-brew
hibernate.name=Hibernate core
hibernate.when=runtime, required
Modified: core/branches/Branch_3_2_4_SP1_CP/readme.txt
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/readme.txt 2008-06-25 05:26:15 UTC (rev 14809)
+++ core/branches/Branch_3_2_4_SP1_CP/readme.txt 2008-06-25 07:29:21 UTC (rev 14810)
@@ -1,6 +1,6 @@
Hibernate - Relational Persistence for Idiomatic Java
=====================================================
-version 3.2.4.sp1.cp03, May 2, 2008
+version 3.2.4.sp1.cp04
Copyright © 2008 Red Hat, Inc.
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java 2008-06-25 05:26:15 UTC (rev 14809)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java 2008-06-25 07:29:21 UTC (rev 14810)
@@ -153,7 +153,7 @@
*/
public final class Environment {
- public static final String VERSION = "3.2.4.sp1.cp03";
+ public static final String VERSION = "3.2.4.sp1.cp04";
/**
* <tt>ConnectionProvider</tt> implementor to use when obtaining connections
16 years, 6 months
Hibernate SVN: r14809 - core/branches/Branch_3_2_4_SP1_CP/lib.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-25 01:26:15 -0400 (Wed, 25 Jun 2008)
New Revision: 14809
Modified:
core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
Log:
JBPAPP-922 - Set EAP 4.2 CP04 / 4.3 CP02 targets that are hibernate dependencies to 4.2.0.GA_CP04
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-06-25 05:06:52 UTC (rev 14808)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-06-25 05:26:15 UTC (rev 14809)
@@ -54,7 +54,7 @@
## j2ee related
jboss-j2ee.lib=jboss-j2ee.jar
-jboss-j2ee.version=4.2.0.GA_CP03
+jboss-j2ee.version=4.2.0.GA_CP04
jboss-j2ee.name=J2EE API
jboss-j2ee.when=runtime, required for standalone operation (outside application server)
@@ -74,15 +74,15 @@
jboss-common.when=runtime, optional (required by TreeCache)
jboss-jmx.lib=jboss-jmx.jar
-jboss-jmx.version=4.2.0.GA_CP03
+jboss-jmx.version=4.2.0.GA_CP04
jboss-jmx.when=runtime, optional (required by TreeCache)
jboss-minimal.lib=jboss-minimal.jar
-jboss-minimal.version=4.2.0.GA_CP03
+jboss-minimal.version=4.2.0.GA_CP04
jboss-minimal.when=runtime, optional (required by TreeCache)
jboss-system.lib=jboss-system.jar
-jboss-system.version=4.2.0.GA_CP03
+jboss-system.version=4.2.0.GA_CP04
jboss-system.when=runtime, optional (required by TreeCache)
## Replication
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-06-25 05:06:52 UTC (rev 14808)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-06-25 05:26:15 UTC (rev 14809)
@@ -103,7 +103,7 @@
## j2ee related
jboss-j2ee.lib=jboss-j2ee.jar
-jboss-j2ee.version=4.2.0.GA_CP03
+jboss-j2ee.version=4.2.0.GA_CP04
jboss-j2ee.name=J2EE API
jboss-j2ee.when=runtime, required for standalone operation (outside application server)
@@ -128,15 +128,15 @@
jboss-common.when=runtime, optional (required by TreeCache)
jboss-jmx.lib=jboss-jmx.jar
-jboss-jmx.version=4.2.0.GA_CP03
+jboss-jmx.version=4.2.0.GA_CP04
jboss-jmx.when=runtime, optional (required by TreeCache)
jboss-minimal.lib=jboss-minimal.jar
-jboss-minimal.version=4.2.0.GA_CP03
+jboss-minimal.version=4.2.0.GA_CP04
jboss-minimal.when=runtime, optional (required by TreeCache)
jboss-system.lib=jboss-system.jar
-jboss-system.version=4.2.0.GA_CP03
+jboss-system.version=4.2.0.GA_CP04
jboss-system.when=runtime, optional (required by TreeCache)
## Replication
16 years, 6 months
Hibernate SVN: r14808 - in core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate: test/legacy and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-25 01:06:52 -0400 (Wed, 25 Jun 2008)
New Revision: 14808
Modified:
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/functional/FunctionalTestCase.java
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/MasterDetailTest.java
Log:
JBPAPP-231 - MasterDetailTest fails against MSSQL 2005
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/functional/FunctionalTestCase.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/functional/FunctionalTestCase.java 2008-06-25 01:57:10 UTC (rev 14807)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/functional/FunctionalTestCase.java 2008-06-25 05:06:52 UTC (rev 14808)
@@ -4,6 +4,7 @@
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.sql.Connection;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Mappings;
@@ -278,8 +279,30 @@
}
+ /**
+ * Do connections enforce SERIALIZABLE isolation...
+ *
+ * @return
+ * @throws Exception
+ */
+ protected boolean isSerializableIsolationEnforced() throws Exception {
+ Connection conn = null;
+ try {
+ conn = sfi().getConnectionProvider().getConnection();
+ return conn.getTransactionIsolation() >= Connection.TRANSACTION_SERIALIZABLE;
+ }
+ finally {
+ if ( conn != null ) {
+ try {
+ sfi().getConnectionProvider().closeConnection( conn );
+ }
+ catch ( Throwable ignore ) {
+ // ignore...
+ }
+ }
+ }
+ }
-
/**
* Is connection at least read committed?
* <p/>
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/MasterDetailTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/MasterDetailTest.java 2008-06-25 01:57:10 UTC (rev 14807)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/MasterDetailTest.java 2008-06-25 05:06:52 UTC (rev 14808)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.sql.Connection;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -835,6 +836,10 @@
}
public void testCachedCollectionRefresh() throws Exception {
+ if ( isSerializableIsolationEnforced() ) {
+ reportSkip( "SERIALIZABLE isolation", "cached collection refreshing" );
+ return;
+ }
Session s = openSession();
Category c = new Category();
List list = new ArrayList();
@@ -853,7 +858,9 @@
s.close();
s = openSession();
- if ( (getDialect() instanceof MySQLDialect) ) s.connection().setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+ if ( (getDialect() instanceof MySQLDialect) ) {
+ s.connection().setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+ }
c = (Category) s.load(Category.class, id);
c.getSubcategories().size(); //force load
16 years, 6 months
Hibernate SVN: r14807 - annotations/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-24 21:57:10 -0400 (Tue, 24 Jun 2008)
New Revision: 14807
Added:
annotations/tags/3_2_1_GA_CP02/
Log:
JBPAPP-918 - created tag 3_2_1_GA_CP02
Copied: annotations/tags/3_2_1_GA_CP02 (from rev 14806, annotations/branches/v3_2_1_GA_CP)
16 years, 6 months
Hibernate SVN: r14806 - annotations/branches/v3_2_1_GA_CP.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-24 21:39:38 -0400 (Tue, 24 Jun 2008)
New Revision: 14806
Modified:
annotations/branches/v3_2_1_GA_CP/build.xml
Log:
JBPAPP-782 - change version to 3.2.1.GA.CP02 in build.xml
Modified: annotations/branches/v3_2_1_GA_CP/build.xml
===================================================================
--- annotations/branches/v3_2_1_GA_CP/build.xml 2008-06-25 00:24:27 UTC (rev 14805)
+++ annotations/branches/v3_2_1_GA_CP/build.xml 2008-06-25 01:39:38 UTC (rev 14806)
@@ -16,7 +16,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Annotations"/>
<property name="name" value="hibernate-annotations"/>
- <property name="version" value="3.2.1.GA"/>
+ <property name="version" value="3.2.1.GA.CP02"/>
<property name="javadoc.packagenames" value="org.hibernate.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
16 years, 6 months
Hibernate SVN: r14805 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-24 20:24:27 -0400 (Tue, 24 Jun 2008)
New Revision: 14805
Added:
entitymanager/tags/v3_2_1_GA_CP03/
Log:
JBPAPP-918 - creating tag v3_2_1_GA_CP03 having internal version 3.2.1.GA_CP03
Copied: entitymanager/tags/v3_2_1_GA_CP03 (from rev 14804, entitymanager/branches/v3_2_1_GA_CP)
16 years, 6 months
Hibernate SVN: r14804 - in entitymanager/branches/v3_2_1_GA_CP: src/java/org/hibernate/ejb and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-24 18:28:35 -0400 (Tue, 24 Jun 2008)
New Revision: 14804
Modified:
entitymanager/branches/v3_2_1_GA_CP/build.xml
entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java
Log:
JBPAPP-918 - Setting internal version to 3.2.1.GA_CP03
Modified: entitymanager/branches/v3_2_1_GA_CP/build.xml
===================================================================
--- entitymanager/branches/v3_2_1_GA_CP/build.xml 2008-06-24 21:21:35 UTC (rev 14803)
+++ entitymanager/branches/v3_2_1_GA_CP/build.xml 2008-06-24 22:28:35 UTC (rev 14804)
@@ -16,7 +16,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate EntityManager"/>
<property name="name" value="hibernate-entitymanager"/>
- <property name="version" value="3.2.1.GA_CP02"/>
+ <property name="version" value="3.2.1.GA_CP03"/>
<property name="javadoc.packagenames" value="org.hibernate.ejb.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
Modified: entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java 2008-06-24 21:21:35 UTC (rev 14803)
+++ entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java 2008-06-24 22:28:35 UTC (rev 14804)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.2.1.GA_CP02";
+ public static final String VERSION = "3.2.1.GA_CP03";
private static Log log = LogFactory.getLog( Version.class );
static {
16 years, 6 months
Hibernate SVN: r14803 - core/branches/Branch_3_2_4_SP1_CP.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-06-24 17:21:35 -0400 (Tue, 24 Jun 2008)
New Revision: 14803
Modified:
core/branches/Branch_3_2_4_SP1_CP/build.xml
Log:
JBPAPP-917 - change to target JDK 1.5
Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-06-24 20:10:36 UTC (rev 14802)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-06-24 21:21:35 UTC (rev 14803)
@@ -62,7 +62,7 @@
<property name="javadoc.url.jse" value="http://java.sun.com/j2se/1.4/docs/api"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
- <property name="javac.target" value="1.4"/>
+ <property name="javac.target" value="1.5"/>
<property name="javac.source" value="1.4"/>
<property name="jar.driver" value="${dir.jdbc}/hsqldb.jar"/>
<property name="jar.clover" value="${ant.home}/lib/clover.jar"/>
16 years, 6 months