Hibernate SVN: r10519 - branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:51:29 -0400 (Thu, 21 Sep 2006)
New Revision: 10519
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/AbstractFlushingEventListener.java
Log:
HHH-2093 PERSIST_ON_FLUSH ineffective for recursive object graphs
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/AbstractFlushingEventListener.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/AbstractFlushingEventListener.java 2006-09-22 01:50:45 UTC (rev 10518)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/AbstractFlushingEventListener.java 2006-09-22 01:51:29 UTC (rev 10519)
@@ -113,22 +113,23 @@
final Map.Entry[] list = IdentityMap.concurrentEntries( session.getPersistenceContext().getEntityEntries() );
//safe from concurrent modification because of how entryList() is implemented on IdentityMap
final int size = list.length;
+ final Object anything = getAnything();
for ( int i=0; i<size; i++ ) {
Map.Entry me = list[i];
EntityEntry entry = (EntityEntry) me.getValue();
Status status = entry.getStatus();
if ( status == Status.MANAGED || status == Status.SAVING ) {
- cascadeOnFlush( session, entry.getPersister(), me.getKey() );
+ cascadeOnFlush( session, entry.getPersister(), me.getKey(), anything );
}
}
}
- private void cascadeOnFlush(EventSource session, EntityPersister persister, Object object)
+ private void cascadeOnFlush(EventSource session, EntityPersister persister, Object object, Object anything)
throws HibernateException {
session.getPersistenceContext().incrementCascadeLevel();
try {
new Cascade( getCascadingAction(), Cascade.BEFORE_FLUSH, session )
- .cascade( persister, object, getAnything() );
+ .cascade( persister, object, anything );
}
finally {
session.getPersistenceContext().decrementCascadeLevel();
18 years, 3 months
Hibernate SVN: r10518 - trunk/Hibernate3/src/org/hibernate/cfg
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:50:45 -0400 (Thu, 21 Sep 2006)
New Revision: 10518
Modified:
trunk/Hibernate3/src/org/hibernate/cfg/Settings.java
Log:
strictJPAQLCompliance was a public field
Modified: trunk/Hibernate3/src/org/hibernate/cfg/Settings.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/cfg/Settings.java 2006-09-22 01:50:41 UTC (rev 10517)
+++ trunk/Hibernate3/src/org/hibernate/cfg/Settings.java 2006-09-22 01:50:45 UTC (rev 10518)
@@ -64,7 +64,7 @@
private EntityMode defaultEntityMode;
private boolean dataDefinitionImplicitCommit;
private boolean dataDefinitionInTransactionSupported;
- public boolean strictJPAQLCompliance;
+ private boolean strictJPAQLCompliance;
// private BytecodeProvider bytecodeProvider;
/**
18 years, 3 months
Hibernate SVN: r10517 - branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:50:41 -0400 (Thu, 21 Sep 2006)
New Revision: 10517
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java
Log:
strictJPAQLCompliance was a public field
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java 2006-09-22 01:34:26 UTC (rev 10516)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java 2006-09-22 01:50:41 UTC (rev 10517)
@@ -64,7 +64,7 @@
private EntityMode defaultEntityMode;
private boolean dataDefinitionImplicitCommit;
private boolean dataDefinitionInTransactionSupported;
- public boolean strictJPAQLCompliance;
+ private boolean strictJPAQLCompliance;
// private BytecodeProvider bytecodeProvider;
/**
18 years, 3 months
Hibernate SVN: r10516 - in trunk/HibernateExt/tools: . doc/reference/en lib/testlibs
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:34:26 -0400 (Thu, 21 Sep 2006)
New Revision: 10516
Modified:
trunk/HibernateExt/tools/build.xml
trunk/HibernateExt/tools/doc/reference/en/master.xml
trunk/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
trunk/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
Log:
bump version + updated testlibs
Modified: trunk/HibernateExt/tools/build.xml
===================================================================
--- trunk/HibernateExt/tools/build.xml 2006-09-22 01:33:32 UTC (rev 10515)
+++ trunk/HibernateExt/tools/build.xml 2006-09-22 01:34:26 UTC (rev 10516)
@@ -7,7 +7,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Tools"/>
<property name="name" value="hibernate-tools"/>
- <property name="version" value="3.2.0beta7"/>
+ <property name="version" value="3.2.0beta8"/>
<property name="javadoc.packagenames" value="org.hibernate.tool"/>
Modified: trunk/HibernateExt/tools/doc/reference/en/master.xml
===================================================================
--- trunk/HibernateExt/tools/doc/reference/en/master.xml 2006-09-22 01:33:32 UTC (rev 10515)
+++ trunk/HibernateExt/tools/doc/reference/en/master.xml 2006-09-22 01:34:26 UTC (rev 10516)
@@ -14,7 +14,7 @@
<subtitle>Reference Guide</subtitle>
- <releaseinfo>3.2.0.beta7</releaseinfo>
+ <releaseinfo>3.2.0.beta8</releaseinfo>
<mediaobject>
<imageobject>
Modified: trunk/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
===================================================================
(Binary files differ)
Modified: trunk/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
===================================================================
(Binary files differ)
18 years, 3 months
Hibernate SVN: r10515 - in trunk/HibernateExt/tools/src/test/org/hibernate/tool: . test/jdbc2cfg
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:33:32 -0400 (Thu, 21 Sep 2006)
New Revision: 10515
Modified:
trunk/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/Jdbc2CfgAllTests.java
Log:
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java 2006-09-22 01:33:00 UTC (rev 10514)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java 2006-09-22 01:33:32 UTC (rev 10515)
@@ -43,9 +43,8 @@
protected void tearDown() throws Exception {
if (getOutputDir()!=null) TestHelper.deleteDir(getOutputDir());
- //assertEquals("Method not found errors during template processing:\n " + HibernateUberspect.getMethodErrors(),0,HibernateUberspect.getMethodNotFoundCount());
- // assertNoTables();
+ assertNoTables();
}
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/Jdbc2CfgAllTests.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/Jdbc2CfgAllTests.java 2006-09-22 01:33:00 UTC (rev 10514)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/Jdbc2CfgAllTests.java 2006-09-22 01:33:32 UTC (rev 10515)
@@ -13,6 +13,7 @@
suite.addTest( PerformanceTest.suite() );
suite.addTest( NoPrimaryKeyTest.suite() );
suite.addTest( SearchEscapeStringTest.suite() );
+ suite.addTest( ManyToManyTest.suite() );
suite.addTest( OverrideBinderTest.suite() );
suite.addTest( VersioningTest.suite() );
suite.addTest( MetaDataTest.suite() );
@@ -21,8 +22,8 @@
suite.addTest( OracleCompositeIdOrderTest.suite() );
suite.addTest( ForeignKeysTest.suite() );
suite.addTest( RevEngForeignKeyTests.suite() );
+ suite.addTest( OracleViewsTest.suite() );
suite.addTest( BasicTest.suite() );
- suite.addTest( OracleViewsTest.suite() );
suite.addTest( AutoQuoteTest.suite() );
suite.addTest( KeyPropertyCompositeIdTest.suite() );
suite.addTest( PersistentClassesTest.suite() );
18 years, 3 months
Hibernate SVN: r10514 - in trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x: . hbm2hbmxml
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:33:00 -0400 (Thu, 21 Sep 2006)
New Revision: 10514
Modified:
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2XAllTests.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Cfg2HbmAllTests.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java
Log:
fixed test
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2XAllTests.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2XAllTests.java 2006-09-22 01:32:37 UTC (rev 10513)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2XAllTests.java 2006-09-22 01:33:00 UTC (rev 10514)
@@ -9,9 +9,12 @@
TestSuite suite = new TestSuite( "Test for org.hibernate.tool.hbm2x" );
//$JUnit-BEGIN$
suite.addTestSuite( Hbm2JavaConstructorTest.class );
- suite.addTestSuite( Hbm2JavaBidirectionalIndexedCollectionMappingTest.class );
+ suite
+ .addTestSuite( Hbm2JavaBidirectionalIndexedCollectionMappingTest.class );
suite.addTestSuite( Hbm2JavaTest.class );
+ suite.addTestSuite( DefaultSchemaCatalogTest.class );
suite.addTestSuite( GenerateFromJDBCTest.class );
+ suite.addTestSuite( HashcodeEqualsTest.class );
suite.addTestSuite( Hbm2DaoTest.class );
suite.addTestSuite( XMLPrettyPrinterTest.class );
suite.addTestSuite( Hbm2JavaEjb3Test.class );
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Cfg2HbmAllTests.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Cfg2HbmAllTests.java 2006-09-22 01:32:37 UTC (rev 10513)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Cfg2HbmAllTests.java 2006-09-22 01:33:00 UTC (rev 10514)
@@ -10,6 +10,7 @@
//$JUnit-BEGIN$
suite.addTest( ManyToManyTest.suite() );
suite.addTest( Hbm2HbmXmlTest.suite() );
+ suite.addTest( InheritanceTest.suite() );
//$JUnit-END$
return suite;
}
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java 2006-09-22 01:32:37 UTC (rev 10513)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java 2006-09-22 01:33:00 UTC (rev 10514)
@@ -92,8 +92,5 @@
return new TestSuite(InheritanceTest.class);
}
- protected void tearDown() throws Exception {
- // TODO Auto-generated method stub
- // super.tearDown();
- }
+
}
18 years, 3 months
Hibernate SVN: r10513 - trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:32:37 -0400 (Thu, 21 Sep 2006)
New Revision: 10513
Modified:
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/GenericExporterTest.java
Log:
move displaced Version class
including version bump
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/GenericExporterTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/GenericExporterTest.java 2006-09-22 01:32:04 UTC (rev 10512)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/GenericExporterTest.java 2006-09-22 01:32:37 UTC (rev 10513)
@@ -11,6 +11,7 @@
import java.util.Properties;
import org.hibernate.tool.NonReflectiveTestCase;
+import org.hibernate.tool.Version;
/**
* @author max
18 years, 3 months
Hibernate SVN: r10512 - in trunk/HibernateExt/tools/src/java/org/hibernate/tool: . hbm2x
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:32:04 -0400 (Thu, 21 Sep 2006)
New Revision: 10512
Added:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/Version.java
Removed:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java
Log:
move displaced Version class
including version bump
Copied: trunk/HibernateExt/tools/src/java/org/hibernate/tool/Version.java (from rev 10260, trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java)
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java 2006-08-14 14:37:33 UTC (rev 10260)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/Version.java 2006-09-22 01:32:04 UTC (rev 10512)
@@ -0,0 +1,39 @@
+package org.hibernate.tool;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+final public class Version {
+
+ public static final String VERSION = "3.2.0.beta8";
+
+ private static final Version instance = new Version();
+
+ private static Log log = LogFactory.getLog( Version.class );
+
+ static {
+ log.info( "Hibernate Tools " + VERSION );
+ }
+
+ private Version() {
+ // dont instantiate me
+ }
+
+ public String getVersion() {
+ return VERSION;
+ }
+
+ public static Version getDefault() {
+ return instance;
+ }
+
+ public String toString() {
+ return getVersion();
+ }
+
+ public static void touch() {}
+
+ public static void main(String[] args) {
+ System.out.println(new Version());
+ }
+}
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java 2006-09-22 01:31:35 UTC (rev 10511)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java 2006-09-22 01:32:04 UTC (rev 10512)
@@ -18,6 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.hibernate.tool.Version;
import freemarker.cache.ClassTemplateLoader;
import freemarker.cache.FileTemplateLoader;
Deleted: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java 2006-09-22 01:31:35 UTC (rev 10511)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java 2006-09-22 01:32:04 UTC (rev 10512)
@@ -1,39 +0,0 @@
-package org.hibernate.tool.hbm2x;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-final public class Version {
-
- public static final String VERSION = "3.2.0.beta7";
-
- private static final Version instance = new Version();
-
- private static Log log = LogFactory.getLog( Version.class );
-
- static {
- log.info( "Hibernate Tools " + VERSION );
- }
-
- private Version() {
- // dont instantiate me
- }
-
- public String getVersion() {
- return VERSION;
- }
-
- public static Version getDefault() {
- return instance;
- }
-
- public String toString() {
- return getVersion();
- }
-
- public static void touch() {}
-
- public static void main(String[] args) {
- System.out.println(new Version());
- }
-}
18 years, 3 months
Hibernate SVN: r10511 - trunk/HibernateExt/tools/src/java/org/hibernate/cfg
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 21:31:35 -0400 (Thu, 21 Sep 2006)
New Revision: 10511
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
Log:
less logging
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java 2006-09-21 23:52:22 UTC (rev 10510)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java 2006-09-22 01:31:35 UTC (rev 10511)
@@ -800,7 +800,7 @@
}
private static Property makeProperty(String propertyName, Value value, boolean insertable, boolean updatable, boolean lazy, String cascade, String propertyAccessorName) {
- log.debug("Building property " + propertyName);
+ log.debug("Building property " + propertyName);
Property prop = new Property();
prop.setName(propertyName);
prop.setValue(value);
@@ -810,7 +810,7 @@
prop.setCascade(cascade==null?"none":cascade);
prop.setPropertyAccessorName(propertyAccessorName==null?"property":propertyAccessorName);
prop.setMetaAttributes(Collections.EMPTY_MAP);
- log.debug("Cascading " + propertyName + " with " + cascade);
+
return prop;
}
18 years, 3 months
Hibernate SVN: r10510 - trunk/HibernateExt/tools/src/java/org/hibernate/tool/ant
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-09-21 19:52:22 -0400 (Thu, 21 Sep 2006)
New Revision: 10510
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
Log:
HBX-761 many-to-many not enabled as default in ant
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java 2006-09-21 21:10:01 UTC (rev 10509)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java 2006-09-21 23:52:22 UTC (rev 10510)
@@ -32,9 +32,8 @@
private String packageName;
private Path revengFiles;
- private boolean detectManyToMany;
-
- private boolean detectOptimisticLock;
+ private boolean detectManyToMany = true;
+ private boolean detectOptimisticLock = true;
public JDBCConfigurationTask() {
setDescription("JDBC Configuration (for reverse engineering)");
18 years, 3 months