Hibernate SVN: r13987 - in documentation-style/trunk: src/main/css and 4 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 17:11:26 -0400 (Fri, 31 Aug 2007)
New Revision: 13987
Added:
documentation-style/trunk/src/main/css/shared/
documentation-style/trunk/src/main/css/shared/html.css
documentation-style/trunk/src/main/images/shared/
documentation-style/trunk/src/main/images/shared/images/
Removed:
documentation-style/trunk/src/main/css/html.css
documentation-style/trunk/src/main/images/images/
Modified:
documentation-style/trunk/pom.xml
documentation-style/trunk/src/main/xslt/standard/fopdf.xsl
documentation-style/trunk/src/main/xslt/standard/html_chunk.xsl
Log:
various cleanup
Modified: documentation-style/trunk/pom.xml
===================================================================
--- documentation-style/trunk/pom.xml 2007-08-31 20:30:16 UTC (rev 13986)
+++ documentation-style/trunk/pom.xml 2007-08-31 21:11:26 UTC (rev 13987)
@@ -1,5 +1,24 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<!--
+ ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~
+ ~ This copyrighted material is made available to anyone wishing to use, modify,
+ ~ copy, or redistribute it subject to the terms and conditions of the GNU
+ ~ Lesser General Public License, v. 2.1. This program is distributed in the
+ ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
+ ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details. You should have received a
+ ~ copy of the GNU Lesser General Public License, v.2.1 along with this
+ ~ distribution; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ~
+ ~ Red Hat Author(s): Steve Ebersole
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.hibernate</groupId>
@@ -57,4 +76,4 @@
</snapshotRepository>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Deleted: documentation-style/trunk/src/main/css/html.css
===================================================================
--- documentation-style/trunk/src/main/css/html.css 2007-08-31 20:30:16 UTC (rev 13986)
+++ documentation-style/trunk/src/main/css/html.css 2007-08-31 21:11:26 UTC (rev 13987)
@@ -1,97 +0,0 @@
-A {
- color: #003399;
-}
-
-A:active {
- color: #003399;
-}
-
-A:visited {
- color: #888888;
-}
-
-P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
- color: #000000;
-}
-
-TD, TH, SPAN {
- color: #000000;
-}
-
-BLOCKQUOTE {
- margin-right: 0px;
-}
-
-
-H1, H2, H3, H4, H5, H6 {
- color: #000000;
- font-weight:500;
- margin-top:10px;
- padding-top:15px;
-}
-
-TABLE {
- border-collapse: collapse;
- border-spacing:0;
- border: 1px thin black;
- empty-cells: hide;
-}
-
-TD {
- padding: 4pt;
-}
-
-H1 { font-size: 150%; }
-H2 { font-size: 140%; }
-H3 { font-size: 110%; font-weight: bold; }
-H4 { font-size: 110%; font-weight: bold;}
-H5 { font-size: 100%; font-style: italic; }
-H6 { font-size: 100%; font-style: italic; }
-
-TT {
-font-size: 90%;
- font-family: "Courier New", Courier, monospace;
- color: #000000;
-}
-
-PRE {
-font-size: 100%;
- padding: 5px;
- border-style: solid;
- border-width: 1px;
- border-color: #CCCCCC;
- background-color: #F4F4F4;
-}
-
-UL, OL, LI {
- list-style: disc;
-}
-
-HR {
- width: 100%;
- height: 1px;
- background-color: #CCCCCC;
- border-width: 0px;
- padding: 0px;
- color: #CCCCCC;
-}
-
-.variablelist {
- padding-top: 10;
- padding-bottom:10;
- margin:0;
-}
-
-.itemizedlist, UL {
- padding-top: 0;
- padding-bottom:0;
- margin:0;
-}
-
-.term {
- font-weight:bold;
-}
-
-
-
-
Copied: documentation-style/trunk/src/main/css/shared/html.css (from rev 13978, documentation-style/trunk/src/main/css/html.css)
===================================================================
--- documentation-style/trunk/src/main/css/shared/html.css (rev 0)
+++ documentation-style/trunk/src/main/css/shared/html.css 2007-08-31 21:11:26 UTC (rev 13987)
@@ -0,0 +1,97 @@
+A {
+ color: #003399;
+}
+
+A:active {
+ color: #003399;
+}
+
+A:visited {
+ color: #888888;
+}
+
+P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+ color: #000000;
+}
+
+TD, TH, SPAN {
+ color: #000000;
+}
+
+BLOCKQUOTE {
+ margin-right: 0px;
+}
+
+
+H1, H2, H3, H4, H5, H6 {
+ color: #000000;
+ font-weight:500;
+ margin-top:10px;
+ padding-top:15px;
+}
+
+TABLE {
+ border-collapse: collapse;
+ border-spacing:0;
+ border: 1px thin black;
+ empty-cells: hide;
+}
+
+TD {
+ padding: 4pt;
+}
+
+H1 { font-size: 150%; }
+H2 { font-size: 140%; }
+H3 { font-size: 110%; font-weight: bold; }
+H4 { font-size: 110%; font-weight: bold;}
+H5 { font-size: 100%; font-style: italic; }
+H6 { font-size: 100%; font-style: italic; }
+
+TT {
+font-size: 90%;
+ font-family: "Courier New", Courier, monospace;
+ color: #000000;
+}
+
+PRE {
+font-size: 100%;
+ padding: 5px;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #CCCCCC;
+ background-color: #F4F4F4;
+}
+
+UL, OL, LI {
+ list-style: disc;
+}
+
+HR {
+ width: 100%;
+ height: 1px;
+ background-color: #CCCCCC;
+ border-width: 0px;
+ padding: 0px;
+ color: #CCCCCC;
+}
+
+.variablelist {
+ padding-top: 10;
+ padding-bottom:10;
+ margin:0;
+}
+
+.itemizedlist, UL {
+ padding-top: 0;
+ padding-bottom:0;
+ margin:0;
+}
+
+.term {
+ font-weight:bold;
+}
+
+
+
+
Copied: documentation-style/trunk/src/main/images/shared/images (from rev 13978, documentation-style/trunk/src/main/images/images)
Modified: documentation-style/trunk/src/main/xslt/standard/fopdf.xsl
===================================================================
--- documentation-style/trunk/src/main/xslt/standard/fopdf.xsl 2007-08-31 20:30:16 UTC (rev 13986)
+++ documentation-style/trunk/src/main/xslt/standard/fopdf.xsl 2007-08-31 21:11:26 UTC (rev 13987)
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
<!--
+ ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~
+ ~ This copyrighted material is made available to anyone wishing to use, modify,
+ ~ copy, or redistribute it subject to the terms and conditions of the GNU
+ ~ Lesser General Public License, v. 2.1. This program is distributed in the
+ ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
+ ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details. You should have received a
+ ~ copy of the GNU Lesser General Public License, v.2.1 along with this
+ ~ distribution; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ~
+ ~ Red Hat Author(s): Christian Bauer, Steve Ebersole
+ -->
- This is the XSL FO configuration file for the Hibernate
- Reference Documentation. It defines a custom titlepage and
- the parameters for the A4 sized PDF printable output.
-
- It took me days to figure out this stuff and fix most of
- the obvious bugs in the DocBook XSL distribution. Some of
- the workarounds might not be appropriate with a newer version
- of DocBook XSL. This file is released as part of Hibernate,
- hence LGPL licensed.
-
- christian(a)hibernate.org
-
--->
-
<xsl:stylesheet
version="1.0"
xmlns="http://www.w3.org/TR/xhtml1/transitional"
@@ -30,8 +30,10 @@
Custom Title Page
################################################### -->
- <xsl:param name="custom.titlepage.img">1</xsl:param>
+ <!-- TODO : move this inside the docbook sources -->
+ <xsl:param name="custom.titlepage.img">shared/images/hibernate_logo_a.png</xsl:param>
+
<xsl:template name="book.titlepage.recto">
<fo:block>
<fo:table table-layout="fixed" width="175mm">
Modified: documentation-style/trunk/src/main/xslt/standard/html_chunk.xsl
===================================================================
--- documentation-style/trunk/src/main/xslt/standard/html_chunk.xsl 2007-08-31 20:30:16 UTC (rev 13986)
+++ documentation-style/trunk/src/main/xslt/standard/html_chunk.xsl 2007-08-31 21:11:26 UTC (rev 13987)
@@ -1,19 +1,21 @@
<?xml version="1.0"?>
<!--
+ ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~
+ ~ This copyrighted material is made available to anyone wishing to use, modify,
+ ~ copy, or redistribute it subject to the terms and conditions of the GNU
+ ~ Lesser General Public License, v. 2.1. This program is distributed in the
+ ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
+ ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details. You should have received a
+ ~ copy of the GNU Lesser General Public License, v.2.1 along with this
+ ~ distribution; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ~
+ ~ Red Hat Author(s): Christian Bauer, Steve Ebersole
+ -->
- This is the XSL HTML configuration file for the Hibernate
- Reference Documentation.
-
- It took me days to figure out this stuff and fix most of
- the obvious bugs in the DocBook XSL distribution. Some of
- the workarounds might not be appropriate with a newer version
- of DocBook XSL. This file is released as part of Hibernate,
- hence LGPL licensed.
-
- christian(a)hibernate.org
--->
-
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -29,7 +31,7 @@
<xsl:param name="chunk.section.depth">'5'</xsl:param>
<xsl:param name="use.id.as.filename">'1'</xsl:param>
- <xsl:param name="html.stylesheet">../shared/css/html.css</xsl:param>
+ <xsl:param name="html.stylesheet">shared/css/html.css</xsl:param>
<!-- These extensions are required for table printing and other stuff -->
<xsl:param name="use.extensions">1</xsl:param>
17 years, 3 months
Hibernate SVN: r13986 - core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 16:30:16 -0400 (Fri, 31 Aug 2007)
New Revision: 13986
Added:
core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Container.java
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml
core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java
Log:
HHH-2485 : merge() and collections (test case)
Added: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Container.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Container.java (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Container.java 2007-08-31 20:30:16 UTC (rev 13986)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, v. 2.1. This program is distributed in the
+ * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details. You should have received a
+ * copy of the GNU Lesser General Public License, v.2.1 along with this
+ * distribution; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Red Hat Author(s): Steve Ebersole
+ */
+package org.hibernate.test.collection.set;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Container implementation
+ *
+ * @author Steve Ebersole
+ */
+public class Container {
+ private Long id;
+ private String name;
+ private Set contents = new HashSet();
+
+ public Container() {
+ }
+
+ public Container(String name) {
+ this.name = name;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Set getContents() {
+ return contents;
+ }
+
+ public void setContents(Set contents) {
+ this.contents = contents;
+ }
+
+ public static class Content {
+ private String name;
+
+ public Content() {
+ }
+
+ public Content(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+}
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml 2007-08-31 19:57:06 UTC (rev 13985)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml 2007-08-31 20:30:16 UTC (rev 13986)
@@ -3,7 +3,21 @@
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
+<!--
+ ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~
+ ~ This copyrighted material is made available to anyone wishing to use, modify,
+ ~ copy, or redistribute it subject to the terms and conditions of the GNU
+ ~ Lesser General Public License, v. 2.1. This program is distributed in the
+ ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
+ ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details. You should have received a
+ ~ copy of the GNU Lesser General Public License, v.2.1 along with this
+ ~ distribution; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ~
+ ~ Red Hat Author(s): Steve Ebersole
+ -->
<hibernate-mapping package="org.hibernate.test.collection.set">
<class name="Parent">
@@ -20,4 +34,17 @@
<many-to-one name="parent" class="Parent" cascade="none" />
</class>
+ <class name="Container">
+ <id name="id" type="long">
+ <generator class="increment"/>
+ </id>
+ <property name="name" column="NAME" type="string"/>
+ <set name="contents" table="CONTENTS">
+ <key column="CONTAINER_ID"/>
+ <composite-element class="Container$Content">
+ <property name="name" column="NAME" type="string"/>
+ </composite-element>
+ </set>
+ </class>
+
</hibernate-mapping>
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java 2007-08-31 19:57:06 UTC (rev 13985)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java 2007-08-31 20:30:16 UTC (rev 13986)
@@ -5,9 +5,12 @@
import junit.framework.Test;
import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.collection.PersistentSet;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.stat.CollectionStatistics;
/**
* todo: describe PersistentSetTest
@@ -27,6 +30,11 @@
return new FunctionalTestClassTestSuite( PersistentSetTest.class );
}
+ public void configure(Configuration cfg) {
+ super.configure( cfg );
+ cfg.setProperty( Environment.GENERATE_STATISTICS, "true" );
+ }
+
public void testWriteMethodDirtying() {
Parent parent = new Parent( "p1" );
Child child = new Child( "c1" );
@@ -77,4 +85,192 @@
session.getTransaction().commit();
session.close();
}
+
+ public void testCollectionMerging() {
+ Session session = openSession();
+ session.beginTransaction();
+ Parent parent = new Parent( "p1" );
+ Child child = new Child( "c1" );
+ parent.getChildren().add( child );
+ child.setParent( parent );
+ session.save( parent );
+ session.getTransaction().commit();
+ session.close();
+
+ CollectionStatistics stats = sfi().getStatistics().getCollectionStatistics( Parent.class.getName() + ".children" );
+ long recreateCount = stats.getRecreateCount();
+ long updateCount = stats.getUpdateCount();
+
+ session = openSession();
+ session.beginTransaction();
+ parent = ( Parent ) session.merge( parent );
+ session.getTransaction().commit();
+ session.close();
+
+ assertEquals( 1, parent.getChildren().size() );
+ assertEquals( recreateCount, stats.getRecreateCount() );
+ assertEquals( updateCount, stats.getUpdateCount() );
+
+ session = openSession();
+ session.beginTransaction();
+ parent = ( Parent ) session.get( Parent.class, "p1" );
+ assertEquals( 1, parent.getChildren().size() );
+ session.delete( parent );
+ session.getTransaction().commit();
+ session.close();
+ }
+
+ public void testCollectiondirtyChecking() {
+ Session session = openSession();
+ session.beginTransaction();
+ Parent parent = new Parent( "p1" );
+ Child child = new Child( "c1" );
+ parent.getChildren().add( child );
+ child.setParent( parent );
+ session.save( parent );
+ session.getTransaction().commit();
+ session.close();
+
+ CollectionStatistics stats = sfi().getStatistics().getCollectionStatistics( Parent.class.getName() + ".children" );
+ long recreateCount = stats.getRecreateCount();
+ long updateCount = stats.getUpdateCount();
+
+ session = openSession();
+ session.beginTransaction();
+ parent = ( Parent ) session.get( Parent.class, "p1" );
+ assertEquals( 1, parent.getChildren().size() );
+ session.getTransaction().commit();
+ session.close();
+
+ assertEquals( 1, parent.getChildren().size() );
+ assertEquals( recreateCount, stats.getRecreateCount() );
+ assertEquals( updateCount, stats.getUpdateCount() );
+
+ session = openSession();
+ session.beginTransaction();
+ assertEquals( 1, parent.getChildren().size() );
+ session.delete( parent );
+ session.getTransaction().commit();
+ session.close();
+ }
+
+ public void testCompositeElementWriteMethodDirtying() {
+ Container container = new Container( "p1" );
+ Container.Content c1 = new Container.Content( "c1" );
+ container.getContents().add( c1 );
+ Container.Content c2 = new Container.Content( "c2" );
+
+ Session session = openSession();
+ session.beginTransaction();
+ session.save( container );
+ session.flush();
+ // at this point, the set on container has now been replaced with a PersistentSet...
+ PersistentSet children = ( PersistentSet ) container.getContents();
+
+ assertFalse( children.add( c1 ) );
+ assertFalse( children.isDirty() );
+
+ assertFalse( children.remove( c2 ) );
+ assertFalse( children.isDirty() );
+
+ HashSet otherSet = new HashSet();
+ otherSet.add( c1 );
+ assertFalse( children.addAll( otherSet ) );
+ assertFalse( children.isDirty() );
+
+ assertFalse( children.retainAll( otherSet ) );
+ assertFalse( children.isDirty() );
+
+ otherSet = new HashSet();
+ otherSet.add( c2 );
+ assertFalse( children.removeAll( otherSet ) );
+ assertFalse( children.isDirty() );
+
+ assertTrue( children.retainAll( otherSet ));
+ assertTrue( children.isDirty() );
+ assertTrue( children.isEmpty() );
+
+ children.clear();
+ assertTrue( children.isDirty() );
+
+ session.flush();
+
+ children.clear();
+ assertFalse( children.isDirty() );
+
+ session.delete( container );
+ session.getTransaction().commit();
+ session.close();
+ }
+
+ public void testCompositeElementMergingFailureExpected() {
+ // HHH-2485
+ Session session = openSession();
+ session.beginTransaction();
+ Container container = new Container( "p1" );
+ Container.Content c1 = new Container.Content( "c1" );
+ container.getContents().add( c1 );
+ session.save( container );
+ session.getTransaction().commit();
+ session.close();
+
+ CollectionStatistics stats = sfi().getStatistics().getCollectionStatistics( Container.class.getName() + ".contents" );
+ long recreateCount = stats.getRecreateCount();
+ long updateCount = stats.getUpdateCount();
+
+ container.setName( "another name" );
+
+ session = openSession();
+ session.beginTransaction();
+ container = ( Container ) session.merge( container );
+ session.getTransaction().commit();
+ session.close();
+
+ assertEquals( 1, container.getContents().size() );
+ assertEquals( recreateCount, stats.getRecreateCount() );
+ assertEquals( updateCount, stats.getUpdateCount() );
+
+ session = openSession();
+ session.beginTransaction();
+ container = ( Container ) session.get( Container.class, container.getId() );
+ assertEquals( 1, container.getContents().size() );
+ session.delete( container );
+ session.getTransaction().commit();
+ session.close();
+ }
+
+ public void testCompositeElementCollectionDirtyCheckingFailureExpected() {
+ // HHH-2485
+ Session session = openSession();
+ session.beginTransaction();
+ Container container = new Container( "p1" );
+ Container.Content c1 = new Container.Content( "c1" );
+ container.getContents().add( c1 );
+ session.save( container );
+ session.getTransaction().commit();
+ session.close();
+
+ CollectionStatistics stats = sfi().getStatistics().getCollectionStatistics( Container.class.getName() + ".contents" );
+ long recreateCount = stats.getRecreateCount();
+ long updateCount = stats.getUpdateCount();
+
+ session = openSession();
+ session.beginTransaction();
+ container = ( Container ) session.get( Container.class, container.getId() );
+ assertEquals( 1, container.getContents().size() );
+ session.getTransaction().commit();
+ session.close();
+
+ assertEquals( 1, container.getContents().size() );
+ assertEquals( recreateCount, stats.getRecreateCount() );
+ assertEquals( updateCount, stats.getUpdateCount() );
+
+ session = openSession();
+ session.beginTransaction();
+ container = ( Container ) session.get( Container.class, container.getId() );
+ assertEquals( 1, container.getContents().size() );
+ session.delete( container );
+ session.getTransaction().commit();
+ session.close();
+ }
}
17 years, 3 months
Hibernate SVN: r13985 - core/trunk/testsuite.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 15:57:06 -0400 (Fri, 31 Aug 2007)
New Revision: 13985
Modified:
core/trunk/testsuite/pom.xml
Log:
cleanup
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2007-08-31 19:55:54 UTC (rev 13984)
+++ core/trunk/testsuite/pom.xml 2007-08-31 19:57:06 UTC (rev 13985)
@@ -74,21 +74,21 @@
<!-- logging setup for the test suite -->
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging</artifactId>
<version>99.0-does-not-exist</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
+ <artifactId>commons-logging-api</artifactId>
<version>99.0-does-not-exist</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.2</version>
</dependency>
@@ -96,15 +96,7 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.5</version>
- <classifier>jdk15</classifier>
- </dependency>
--->
+ </dependency>
</dependencies>
<build>
17 years, 3 months
Hibernate SVN: r13984 - core/trunk/core.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 15:55:54 -0400 (Fri, 31 Aug 2007)
New Revision: 13984
Modified:
core/trunk/core/pom.xml
Log:
antlr version override for antlr-maven-plugin (broken in maven <= 2.0.7)
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2007-08-31 18:04:20 UTC (rev 13983)
+++ core/trunk/core/pom.xml 2007-08-31 19:55:54 UTC (rev 13984)
@@ -22,7 +22,7 @@
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.6</version>
+ <version>${antlr.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -35,6 +35,7 @@
<version>1.6.1</version>
</dependency>
<dependency>
+ <!-- YUCK, YUCK, YUCK!!!! -->
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
@@ -82,18 +83,16 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antlr-plugin</artifactId>
-<!--
- This is how we should define dep on antlr...
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.6</version>
+ <version>${antlr.version}</version>
</dependency>
</dependencies>
--->
<configuration>
<grammars>hql.g,hql-sql.g,sql-gen.g</grammars>
</configuration>
@@ -111,8 +110,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antlr-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
<configuration>
<!-- eventually should be based on the second phase grammar -->
<grammars>hql.g</grammars>
@@ -149,4 +149,8 @@
</plugins>
</reporting>
+ <properties>
+ <antlr.version>2.7.6</antlr.version>
+ </properties>
+
</project>
17 years, 3 months
Hibernate SVN: r13983 - maven-poms/trunk/core-manual-parent.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 14:04:20 -0400 (Fri, 31 Aug 2007)
New Revision: 13983
Modified:
maven-poms/trunk/core-manual-parent/pom.xml
Log:
pinned to the hibernate-jdocbook-style 1.0.0 release
Modified: maven-poms/trunk/core-manual-parent/pom.xml
===================================================================
--- maven-poms/trunk/core-manual-parent/pom.xml 2007-08-31 17:59:51 UTC (rev 13982)
+++ maven-poms/trunk/core-manual-parent/pom.xml 2007-08-31 18:04:20 UTC (rev 13983)
@@ -48,8 +48,8 @@
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>reference-manual-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <version>1.0.0</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
17 years, 3 months
Hibernate SVN: r13981 - in documentation-style/tags: hibernate-jdocbook-style-1.0.0 and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 13:59:48 -0400 (Fri, 31 Aug 2007)
New Revision: 13981
Added:
documentation-style/tags/hibernate-jdocbook-style-1.0.0/
documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml
Removed:
documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml
Log:
[maven-release-plugin] copy for tag hibernate-jdocbook-style-1.0.0
Copied: documentation-style/tags/hibernate-jdocbook-style-1.0.0 (from rev 13978, documentation-style/trunk)
Deleted: documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml
===================================================================
--- documentation-style/trunk/pom.xml 2007-08-31 17:50:21 UTC (rev 13978)
+++ documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml 2007-08-31 17:59:48 UTC (rev 13981)
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
- ~
- ~ This copyrighted material is made available to anyone wishing to use, modify,
- ~ copy, or redistribute it subject to the terms and conditions of the GNU
- ~ Lesser General Public License, v. 2.1. This program is distributed in the
- ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
- ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details. You should have received a
- ~ copy of the GNU Lesser General Public License, v.2.1 along with this
- ~ distribution; if not, write to the Free Software Foundation, Inc.,
- ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ~
- ~ Red Hat Author(s): Steve Ebersole
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <packaging>jdocbook-style</packaging>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Hibernate Reference Manual Styles</name>
- <description>The JDocBook styles for the Hibernate Reference Manual.</description>
- <url>http://hibernate.org</url>
-
- <organization>
- <name>Hibernate.org</name>
- <url>http://hibernate.org</url>
- </organization>
-
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/copyleft/lesser.html</url>
- <comments>See discussion at http://hibernate.org/356.html for more details.</comments>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <issueManagement>
- <system>jira</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</url>
- </issueManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-style-plugin</artifactId>
- <version>1.0.0</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
Copied: documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml (from rev 13980, documentation-style/trunk/pom.xml)
===================================================================
--- documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml (rev 0)
+++ documentation-style/tags/hibernate-jdocbook-style-1.0.0/pom.xml 2007-08-31 17:59:48 UTC (rev 13981)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <packaging>jdocbook-style</packaging>
+ <version>1.0.0</version>
+
+ <name>Hibernate Reference Manual Styles</name>
+ <description>The JDocBook styles for the Hibernate Reference Manuals.</description>
+ <url>http://hibernate.org</url>
+
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/copyleft/lesser.html</url>
+ <comments>See discussion at http://hibernate.org/356.html for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/documentation-style/tags...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/documentation-style/tags/hi...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/documentation-style/...</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-style-plugin</artifactId>
+ <version>1.0.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
\ No newline at end of file
17 years, 3 months
Hibernate SVN: r13980 - documentation-style/trunk.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 13:59:44 -0400 (Fri, 31 Aug 2007)
New Revision: 13980
Modified:
documentation-style/trunk/pom.xml
Log:
[maven-release-plugin] prepare release hibernate-jdocbook-style-1.0.0
Modified: documentation-style/trunk/pom.xml
===================================================================
--- documentation-style/trunk/pom.xml 2007-08-31 17:55:36 UTC (rev 13979)
+++ documentation-style/trunk/pom.xml 2007-08-31 17:59:44 UTC (rev 13980)
@@ -1,38 +1,19 @@
-<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<!--
- ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
- ~
- ~ This copyrighted material is made available to anyone wishing to use, modify,
- ~ copy, or redistribute it subject to the terms and conditions of the GNU
- ~ Lesser General Public License, v. 2.1. This program is distributed in the
- ~ hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
- ~ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details. You should have received a
- ~ copy of the GNU Lesser General Public License, v.2.1 along with this
- ~ distribution; if not, write to the Free Software Foundation, Inc.,
- ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ~
- ~ Red Hat Author(s): Steve Ebersole
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jdocbook-style</artifactId>
<packaging>jdocbook-style</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Hibernate Reference Manual Styles</name>
<description>The JDocBook styles for the Hibernate Reference Manuals.</description>
- <url>http://hibernate.org</url>
-
- <organization>
- <name>Hibernate.org</name>
- <url>http://hibernate.org</url>
+ <url>http://hibernate.org</url>
+
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
</organization>
<licenses>
@@ -42,12 +23,12 @@
<comments>See discussion at http://hibernate.org/356.html for more details.</comments>
<distribution>repo</distribution>
</license>
- </licenses>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/documentation-style/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/documentation-style/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/documentation-style/...</url>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/documentation-style/tags...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/documentation-style/tags/hi...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/documentation-style/...</url>
</scm>
<build>
@@ -60,20 +41,20 @@
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
</distributionManagement>
-</project>
+</project>
\ No newline at end of file
17 years, 3 months
Hibernate SVN: r13978 - documentation-style.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-31 13:50:21 -0400 (Fri, 31 Aug 2007)
New Revision: 13978
Added:
documentation-style/tags/
Log:
adding jdocbook-style project for reference manual style
17 years, 3 months