Hibernate SVN: r14426 - annotations/trunk/doc/reference/en/modules.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-14 12:20:09 -0400 (Fri, 14 Mar 2008)
New Revision: 14426
Modified:
annotations/trunk/doc/reference/en/modules/entity.xml
Log:
ANN-610 rewriting of the bidirectional indexed collection example
Modified: annotations/trunk/doc/reference/en/modules/entity.xml
===================================================================
--- annotations/trunk/doc/reference/en/modules/entity.xml 2008-03-14 15:50:34 UTC (rev 14425)
+++ annotations/trunk/doc/reference/en/modules/entity.xml 2008-03-14 16:20:09 UTC (rev 14426)
@@ -2422,9 +2422,10 @@
attribute.</para>
<para>Contrary to their standard counterpart,
- <literal>@GenericGenerator</literal> and <literal>@GenericGenerators</literal>
- can be used in package level annotations, making them application level generators
- (just like if they were in a JPA XML file).</para>
+ <literal>@GenericGenerator</literal> and
+ <literal>@GenericGenerators</literal> can be used in package level
+ annotations, making them application level generators (just like if they
+ were in a JPA XML file).</para>
<programlisting>@GenericGenerators(
{
@@ -3049,29 +3050,32 @@
<para></para>
</sect4>
- <sect4 id="entity-hibspec-collection-extratype-indexbidir">
+ <sect4 id="entity-hibspec-collection-extratype-indexbidir"
+ revision="2">
<title>Bidirectional association with indexed collections</title>
- <para>A bidirectional association where one end is represented as a
- <literal>@IndexColumn</literal> or
- <literal>@org.hibernate.annotations.MapKey[ManyToMany]</literal>
- requires special consideration. If there is a property of the child
- class which maps to the index column, no problem, we can continue
- using <literal>mappedBy</literal> on the collection mapping:</para>
+ <para>A bidirectional association where one end is an indexed
+ collection (ie. represented as a <literal>@IndexColumn</literal>,
+ <literal>@org.hibernate.annotations.MapKey</literal> or
+ <classname>@org.hibernate.annotations.MapKeyManyToMany</classname>)
+ requires special consideration. If a property on the associated
+ class explicitly maps the indexed value, the use of
+ <methodname>mappedBy</methodname> is permitted:</para>
<programlisting>@Entity
public class Parent {
@OneToMany(mappedBy="parent")
- @org.hibernate.annotations.MapKey(columns=@Column(name="name"))
- private Map<String, Child> children;
+ @org.hibernate.annotations.IndexColumn(name="order")
+ private List<Child> children;
...
}
@Entity
public class Child {
...
- @Basic
- private String name;
+ //the index column is mapped as a property in the associated entity
+ @Column(name="order")
+ private int order;
@ManyToOne
@JoinColumn(name="parent_id", nullable=false)
@@ -3082,16 +3086,16 @@
<para>But, if there is no such property on the child class, we can't
think of the association as truly bidirectional (there is
information available at one end of the association that is not
- available at the other end). In this case, we can't map the
- collection <literal>mappedBy</literal>. Instead, we could use the
- following mapping:</para>
+ available at the other end: the index). In this case, we can't map
+ the collection as <literal>mappedBy</literal>. Instead, we could use
+ the following mapping:</para>
<programlisting>@Entity
public class Parent {
@OneToMany
- @org.hibernate.annotations.MapKey(columns=@Column(name="name"))
+ @org.hibernate.annotations.IndexColumn(name="order")
@JoinColumn(name="parent_id", nullable=false)
- private Map<String, Child> children;
+ private List<Child> children;
...
}
@@ -3105,7 +3109,7 @@
}</programlisting>
<para>Note that in this mapping, the collection-valued end of the
- association is responsible for updates to the foreign key.</para>
+ association is responsible for updating the foreign key.</para>
</sect4>
<sect4>
16 years, 9 months
- 1
- 0
Hibernate SVN: r14425 - in annotations/trunk/src: java/org/hibernate/cfg/annotations and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-14 11:50:34 -0400 (Fri, 14 Mar 2008)
New Revision: 14425
Added:
annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/Matrix.java
Modified:
annotations/trunk/src/java/org/hibernate/annotations/MapKey.java
annotations/trunk/src/java/org/hibernate/cfg/annotations/MapBinder.java
annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
Log:
ANN-696 ANN-709 Support @Type on map key
Modified: annotations/trunk/src/java/org/hibernate/annotations/MapKey.java
===================================================================
--- annotations/trunk/src/java/org/hibernate/annotations/MapKey.java 2008-03-14 11:53:11 UTC (rev 14424)
+++ annotations/trunk/src/java/org/hibernate/annotations/MapKey.java 2008-03-14 15:50:34 UTC (rev 14425)
@@ -24,4 +24,9 @@
* Only useful if the collection does not use generics
*/
Class targetElement() default void.class;
+
+ /**
+ * The optional map key type. Guessed if default
+ */
+ Type type() default @Type(type = "");
}
Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/MapBinder.java
===================================================================
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/MapBinder.java 2008-03-14 11:53:11 UTC (rev 14424)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/MapBinder.java 2008-03-14 15:50:34 UTC (rev 14425)
@@ -13,6 +13,7 @@
import org.hibernate.FetchMode;
import org.hibernate.MappingException;
import org.hibernate.annotations.MapKeyManyToMany;
+import org.hibernate.annotations.MapKey;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.XProperty;
import org.hibernate.cfg.AnnotatedClassType;
@@ -232,7 +233,12 @@
column.setTable( mapValue.getCollectionTable() );
}
elementBinder.setColumns( elementColumns );
- elementBinder.setType( property, elementClass );
+ //do not call setType as it extract the type from @Type
+ //the algorithm generally does not apply for map key anyway
+ MapKey mapKeyAnn = property.getAnnotation( org.hibernate.annotations.MapKey.class );
+ if (mapKeyAnn != null && ! BinderHelper.isDefault( mapKeyAnn.type().type() ) ) {
+ elementBinder.setExplicitType( mapKeyAnn.type() );
+ }
mapValue.setIndex( elementBinder.make() );
}
}
Modified: annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java 2008-03-14 11:53:11 UTC (rev 14424)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java 2008-03-14 15:50:34 UTC (rev 14425)
@@ -188,12 +188,27 @@
s.close();
}
+ public void testMapKeyType() throws Exception {
+ Matrix m = new Matrix();
+ m.getValues().put( 1, 1.1f );
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ s.persist( m );
+ s.flush();
+ s.clear();
+ m = (Matrix) s.get( Matrix.class, m.getId() );
+ assertEquals( 1.1f, m.getValues().get( 1 ) );
+ tx.rollback();
+ s.close();
+ }
+
protected Class[] getMappings() {
return new Class[] {
Boy.class,
Country.class,
- TestCourse.class
+ TestCourse.class,
+ Matrix.class
};
}
}
Added: annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/Matrix.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/Matrix.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/Matrix.java 2008-03-14 15:50:34 UTC (rev 14425)
@@ -0,0 +1,42 @@
+//$
+package org.hibernate.test.annotations.collectionelement;
+
+import java.util.Map;
+import java.util.HashMap;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+import org.hibernate.annotations.MapKey;
+import org.hibernate.annotations.CollectionOfElements;
+import org.hibernate.annotations.Type;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+public class Matrix {
+ @Id
+ @GeneratedValue
+ private Integer id;
+ @MapKey(type = @Type(type="integer") )
+ @CollectionOfElements
+ @Type(type = "float")
+ private Map<Integer, Float> values = new HashMap<Integer, Float>();
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Map<Integer, Float> getValues() {
+ return values;
+ }
+
+ public void setValues(Map<Integer, Float> values) {
+ this.values = values;
+ }
+}
16 years, 9 months
- 1
- 0
Hibernate SVN: r14424 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-03-14 07:53:11 -0400 (Fri, 14 Mar 2008)
New Revision: 14424
Removed:
core/tags/hibernate-3.3.0.Alpha1/
Log:
rollback
16 years, 9 months
- 1
- 0
Hibernate SVN: r14423 - in core/trunk: cache-ehcache and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-03-14 07:29:04 -0400 (Fri, 14 Mar 2008)
New Revision: 14423
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-jbosscache2/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/eg/pom.xml
core/trunk/jmx/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
Log:
[maven-release-plugin] rollback the release of hibernate-3.3.0.Alpha1
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/cache-ehcache/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,94 +1,97 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Ehcache Integration</name>
- <description>Integration of Hibernate with Ehcache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Ehcache Integration</name>
+ <description>Integration of Hibernate with Ehcache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/cache-jbosscache/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,125 +1,128 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.GA</version>
- </dependency>
- <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-minimal</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2se</artifactId>
- <version>200504122039</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.7</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <version>1.4.1.GA</version>
+ </dependency>
+ <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-minimal</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>200504122039</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <version>2.2.7</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/cache-jbosscache2/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,154 +1,156 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache2</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache2.x Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache2</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache2.x Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>2.1.0.CR4</version>
</dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>2.1.0.CR4</version>
- </dependency>
- <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.1</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core :( and needed for testing -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core :( and needed for testing -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
<excludes>
<!-- Skip a long-running test of a prototype class -->
<exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>jgroups.bind_addr</name>
+ <value>${jgroups.bind_addr}</value>
+ </property>
+ <!-- There are problems with multicast and IPv6 on some
+ OS/JDK combos, so we tell Java to use IPv4. If you
+ have problems with multicast when running the tests
+ you can try setting this to 'false', although typically
+ that won't be helpful.
+ -->
+ <property>
+ <name>java.net.preferIPv4Stack</name>
+ <value>true</value>
</property>
- <property>
- <name>jgroups.bind_addr</name>
- <value>${jgroups.bind_addr}</value>
- </property>
- <!-- There are problems with multicast and IPv6 on some
- OS/JDK combos, so we tell Java to use IPv4. If you
- have problems with multicast when running the tests
- you can try setting this to 'false', although typically
- that won't be helpful.
- -->
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
<!-- Tell JGroups to only wait a short time for PING
responses before determining coordinator. Speeds cluster
formation during integration tests. (This is too
@@ -172,34 +174,35 @@
<property>
<name>jgroups.udp.enable_bundling</name>
<value>false</value>
- </property>
- </systemProperties>
- <skipExec>${skipUnitTests}</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <skipUnitTests>true</skipUnitTests>
- <!--
- Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
- may be problems with multicast on the interface JGroups uses by default on your machine. You can
- try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
- setting the value to an interface where you know multicast works
- -->
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </properties>
-
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <skipUnitTests>false</skipUnitTests>
- </properties>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+ </property>
+ </systemProperties>
+ <skipExec>${skipUnitTests}</skipExec>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <skipUnitTests>true</skipUnitTests>
+ <!--
+ Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
+ may be problems with multicast on the interface JGroups uses by default on your machine. You can
+ try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
+ setting the value to an interface where you know multicast works
+ -->
+ <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <skipUnitTests>false</skipUnitTests>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/cache-oscache/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,31 +1,34 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate OSCache Integration</name>
- <description>Integration of Hibernate with OSCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate OSCache Integration</name>
+ <description>Integration of Hibernate with OSCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/cache-swarmcache/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,31 +1,34 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate SwarmCache Integration</name>
- <description>Integration of Hibernate with SwarmCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>swarmcache</groupId>
- <artifactId>swarmcache</artifactId>
- <version>1.0RC2</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate SwarmCache Integration</name>
+ <description>Integration of Hibernate with SwarmCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>swarmcache</groupId>
+ <artifactId>swarmcache</artifactId>
+ <version>1.0RC2</version>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/connection-c3p0/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,31 +1,34 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate C3P0 ConnectionProvider</name>
- <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate C3P0 ConnectionProvider</name>
+ <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/connection-proxool/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,31 +1,34 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-proxool</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Proxool ConnectionProvider</name>
- <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>proxool</groupId>
- <artifactId>proxool</artifactId>
- <version>0.8.3</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-proxool</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Proxool ConnectionProvider</name>
+ <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ <version>0.8.3</version>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/core/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,4 +1,6 @@
-<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">
+<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>
@@ -141,4 +143,5 @@
<properties>
<antlrPluginVersion>2.1</antlrPluginVersion>
</properties>
-</project>
\ No newline at end of file
+
+</project>
Modified: core/trunk/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/eg/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,4 +1,6 @@
-<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">
+<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>
@@ -25,4 +27,5 @@
<version>${version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+</project>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/jmx/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,37 +1,40 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jmx</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX capabilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jmx</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JMX Module</name>
+ <description>Defines Hibernate JMX capabilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,105 +1,107 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <packaging>pom</packaging>
- <version>3.3.0-SNAPSHOT</version>
-
- <name>Hibernate Core Aggregator</name>
- <description>Aggregator of the Hibernate Core modules.</description>
- <url>http://hibernate.org</url>
-
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
- </scm>
-
- <modules>
- <module>core</module>
- <module>cache-ehcache</module>
- <module>cache-jbosscache</module>
- <module>cache-jbosscache2</module>
- <module>cache-oscache</module>
- <module>cache-swarmcache</module>
- <module>connection-c3p0</module>
- <module>connection-proxool</module>
- <module>jmx</module>
- <module>testing</module>
- <module>testsuite</module>
- <module>eg</module>
-<!-- Need to scope bytecode providers first
- <module>bytecode-cglib</module>
- <module>bytecode-javassist</module>
--->
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!--
- A profile used implicitly by the release plugin. Here we use it to enable documentation building
- as well as execution of the assembly plugin (to build the SourceForge dist).
- -->
- <id>release</id>
-<!--
- temporarily disable documentation module
- <modules>
- <module>documentation</module>
- </modules>
--->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>deploy</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/hibernate-all.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- seperate profile for documentation activation -->
- <profile>
- <id>docs</id>
- <modules>
- <module>documentation</module>
- </modules>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+
+ <name>Hibernate Core Aggregator</name>
+ <description>Aggregator of the Hibernate Core modules.</description>
+ <url>http://hibernate.org</url>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
+ </scm>
+
+ <modules>
+ <module>core</module>
+ <module>cache-ehcache</module>
+ <module>cache-jbosscache</module>
+ <module>cache-jbosscache2</module>
+ <module>cache-oscache</module>
+ <module>cache-swarmcache</module>
+ <module>connection-c3p0</module>
+ <module>connection-proxool</module>
+ <module>jmx</module>
+ <module>testing</module>
+ <module>testsuite</module>
+ <module>eg</module>
+<!-- Need to scope bytecode providers first
+ <module>bytecode-cglib</module>
+ <module>bytecode-javassist</module>
+-->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
+ A profile used implicitly by the release plugin. Here we use it to enable documentation building
+ as well as execution of the assembly plugin (to build the SourceForge dist).
+ -->
+ <id>release</id>
+<!--
+ temporarily disable documentation module
+ <modules>
+ <module>documentation</module>
+ </modules>
+-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/hibernate-all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- seperate profile for documentation activation -->
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>documentation</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/testing/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,45 +1,48 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testing</name>
- <description>Hibernate JUnit test utilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.hbm.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testing</name>
+ <description>Hibernate JUnit test utilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.hbm.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2008-03-11 17:10:57 UTC (rev 14422)
+++ core/trunk/testsuite/pom.xml 2008-03-14 11:29:04 UTC (rev 14423)
@@ -1,358 +1,361 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testsuite</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testsuite</name>
- <description>The testsuite of Hibernate functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- </dependency>
- <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <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>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>pgsql8</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2-8</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hiber</jdbc.user>
- <jdbc.pass>hiber</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Sybase 12 test envionment -->
- <profile>
- <id>sybase12</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (jTDS) test envionment -->
- <profile>
- <id>sqlserver-jtds</id>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>sqlserver-msjdbc</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
-</project>
\ No newline at end of file
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testsuite</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testsuite</name>
+ <description>The testsuite of Hibernate functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <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>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-test-ext-plugin</artifactId>
+ <version>1.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extend</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <!-- HSQLDB is the default (eventually move to H2) -->
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
+ <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
+ <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass/>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The H2 test envionment -->
+ <profile>
+ <id>h2</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.h2database</groupId>
+ <artifactId>h2database</artifactId>
+ <version>1.0.20061217</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
+ <jdbc.driver>org.h2.Driver</jdbc.driver>
+ <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass/>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Profiles naming db instances in the Red Hat QA/QE lab
+
+ First, those with OSS drivers
+ ###################################################################
+ -->
+
+ <!-- The MySQL5 test envionment -->
+ <profile>
+ <id>mysql5</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+ <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The PostgreSQL test envionment -->
+ <profile>
+ <id>pgsql8</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <classifier>jdbc3</classifier>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+ <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+ <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Then, those with commercial drivers
+ ###################################################################
+ -->
+
+ <!-- The Oracle9i test envionment -->
+ <profile>
+ <id>oracle9i</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Oracle10g test envionment -->
+ <profile>
+ <id>oracle10g</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The DB2 8.x test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2-8</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+ <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+ <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hiber</jdbc.user>
+ <jdbc.pass>hiber</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The Sybase 12 test envionment -->
+ <profile>
+ <id>sybase12</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
+ <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+ <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (jTDS) test envionment -->
+ <profile>
+ <id>sqlserver-jtds</id>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (MS JDBC) test envionment -->
+ <profile>
+ <id>sqlserver-msjdbc</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+ <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation>4096</jdbc.isolation>
+ </properties>
+ </profile>
+
+ </profiles>
+
+</project>
16 years, 9 months
- 1
- 0
Hibernate SVN: r14422 - search/trunk/doc/reference/en/modules.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-11 13:10:57 -0400 (Tue, 11 Mar 2008)
New Revision: 14422
Modified:
search/trunk/doc/reference/en/modules/configuration.xml
Log:
HSEARCH-166 Documentation error wrt to the worker properties
Modified: search/trunk/doc/reference/en/modules/configuration.xml
===================================================================
--- search/trunk/doc/reference/en/modules/configuration.xml 2008-03-11 01:59:25 UTC (rev 14421)
+++ search/trunk/doc/reference/en/modules/configuration.xml 2008-03-11 17:10:57 UTC (rev 14422)
@@ -253,7 +253,7 @@
</row>
<row>
- <entry><literal>hibernate.worker.backend</literal></entry>
+ <entry><literal>hibernate.search.worker.backend</literal></entry>
<entry>Out of the box support for the Apache Lucene back end and
the JMS back end. Default to <literal>lucene</literal>. Supports
@@ -261,7 +261,7 @@
</row>
<row>
- <entry><literal>hibernate.worker.execution</literal></entry>
+ <entry><literal>hibernate.search.worker.execution</literal></entry>
<entry>Supports synchronous and asynchrounous execution. Default
to <literal><literal>sync</literal></literal>. Supports also
@@ -269,14 +269,14 @@
</row>
<row>
- <entry><literal>hibernate.worker.thread_pool.size</literal></entry>
+ <entry><literal>hibernate.search.worker.thread_pool.size</literal></entry>
<entry>Defines the number of threads in the pool. useful only for
asynchrounous execution. Default to 1.</entry>
</row>
<row>
- <entry><literal>hibernate.worker.buffer_queue.max</literal></entry>
+ <entry><literal>hibernate.search.worker.buffer_queue.max</literal></entry>
<entry>Defines the maximal number of work queue if the thread poll
is starved. Useful only for asynchrounous execution. Default to
@@ -285,7 +285,7 @@
</row>
<row>
- <entry><literal>hibernate.worker.jndi.*</literal></entry>
+ <entry><literal>hibernate.search.worker.jndi.*</literal></entry>
<entry>Defines the JNDI properties to initiate the InitialContext
(if needed). JNDI is only used by the JMS back end.</entry>
@@ -293,7 +293,7 @@
<row>
<entry><literal>
- hibernate.worker.jms.connection_factory</literal></entry>
+ hibernate.search.worker.jms.connection_factory</literal></entry>
<entry>Mandatory for the JMS back end. Defines the JNDI name to
lookup the JMS connection factory from
@@ -302,7 +302,7 @@
</row>
<row>
- <entry><literal>hibernate.worker.jms.queue</literal></entry>
+ <entry><literal>hibernate.search.worker.jms.queue</literal></entry>
<entry>Mandatory for the JMS back end. Defines the JNDI name to
lookup the JMS queue from. The queue will be used to post work
@@ -310,7 +310,7 @@
</row>
<row>
- <entry><literal>hibernate.worker.batch_size</literal></entry>
+ <entry><literal>hibernate.search.worker.batch_size</literal></entry>
<entry>Defines the maximum number of elements indexed before
flushing the transaction-bound queue. Default to 0 (ie no limit).
@@ -356,9 +356,9 @@
#optional jndi configuration (check your JMS provider for more information)
## Optional asynchronous execution strategy
-# org.hibernate.worker.execution = async
-# org.hibernate.worker.thread_pool.size = 2
-# org.hibernate.worker.buffer_queue.max = 50</programlisting>
+# hibernate.search.worker.execution = async
+# hibernate.search.worker.thread_pool.size = 2
+# hibernate.search.worker.buffer_queue.max = 50</programlisting>
<para>A file system local copy is recommended for faster search
results.</para>
16 years, 9 months
- 1
- 0
Hibernate SVN: r14421 - in core/trunk: cache-ehcache and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-03-10 21:59:25 -0400 (Mon, 10 Mar 2008)
New Revision: 14421
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-jbosscache2/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/eg/pom.xml
core/trunk/jmx/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/cache-ehcache/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Ehcache Integration</name>
@@ -91,11 +91,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/cache-jbosscache/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate JBossCache Integration</name>
@@ -122,11 +122,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/cache-jbosscache2/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache2</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate JBossCache2.x Integration</name>
@@ -202,11 +202,4 @@
</properties>
</profile>
</profiles>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/cache-oscache/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-oscache</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate OSCache Integration</name>
@@ -28,11 +28,4 @@
<version>2.1</version>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/cache-swarmcache/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-swarmcache</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate SwarmCache Integration</name>
@@ -28,11 +28,4 @@
<version>1.0RC2</version>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/connection-c3p0/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate C3P0 ConnectionProvider</name>
@@ -28,11 +28,4 @@
<version>0.9.1</version>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/connection-proxool/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-proxool</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Proxool ConnectionProvider</name>
@@ -28,11 +28,4 @@
<version>0.8.3</version>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/core/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Core</name>
@@ -141,11 +141,4 @@
<properties>
<antlrPluginVersion>2.1</antlrPluginVersion>
</properties>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/eg/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -12,7 +12,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-eg</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Example</name>
@@ -25,11 +25,4 @@
<version>${version}</version>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/jmx/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate JMX Module</name>
@@ -34,11 +34,4 @@
<version>1.2.14</version>
</dependency>
</dependencies>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -11,16 +11,16 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<packaging>pom</packaging>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<name>Hibernate Core Aggregator</name>
<description>Aggregator of the Hibernate Core modules.</description>
<url>http://hibernate.org</url>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.Alpha1</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
</scm>
<modules>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/testing/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Testing</name>
@@ -42,11 +42,4 @@
</resource>
</resources>
</build>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
+++ core/trunk/testsuite/pom.xml 2008-03-11 01:59:25 UTC (rev 14421)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testsuite</artifactId>
- <version>3.3.0.Alpha1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Testsuite</name>
@@ -355,11 +355,4 @@
</profile>
</profiles>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
16 years, 9 months
- 1
- 0
Hibernate SVN: r14420 - in core/tags: hibernate-3.3.0.Alpha1 and 19 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-03-10 21:59:19 -0400 (Mon, 10 Mar 2008)
New Revision: 14420
Added:
core/tags/hibernate-3.3.0.Alpha1/
core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml
core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml
core/tags/hibernate-3.3.0.Alpha1/core/
core/tags/hibernate-3.3.0.Alpha1/core/pom.xml
core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java
core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java
core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java
core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml
core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml
core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml
core/tags/hibernate-3.3.0.Alpha1/pom.xml
core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml
core/tags/hibernate-3.3.0.Alpha1/src/assembly/hibernate-all.xml
core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt
core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml
core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml
core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml
Removed:
core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml
core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml
core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml
core/tags/hibernate-3.3.0.Alpha1/core/
core/tags/hibernate-3.3.0.Alpha1/core/pom.xml
core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java
core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java
core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java
core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml
core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml
core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml
core/tags/hibernate-3.3.0.Alpha1/pom.xml
core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml
core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt
core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml
core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml
core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml
Log:
[maven-release-plugin] copy for tag hibernate-3.3.0.Alpha1
Copied: core/tags/hibernate-3.3.0.Alpha1 (from rev 14241, core/trunk)
Deleted: core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,97 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Ehcache Integration</name>
- <description>Integration of Hibernate with Ehcache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml (from rev 14419, core/trunk/cache-ehcache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-ehcache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,101 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Ehcache Integration</name>
+ <description>Integration of Hibernate with Ehcache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,128 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.GA</version>
- </dependency>
- <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-minimal</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2se</artifactId>
- <version>200504122039</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.7</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml (from rev 14419, core/trunk/cache-jbosscache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,132 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <version>1.4.1.GA</version>
+ </dependency>
+ <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-minimal</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>200504122039</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <version>2.2.7</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,177 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache2</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache2.x Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <!-- I'd prefer this, at least until we get a GA...
- <version>[2.0.0.BETA2,)</version>
- -->
- <version>2.1.0.BETA1</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core :( and needed for testing -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- <property>
- <name>jgroups.bind_addr</name>
- <value>${jgroups.bind_addr}</value>
- </property>
- <!-- There are problems with multicast and IPv6 on some
- OS/JDK combos, so we tell Java to use IPv4. If you
- have problems with multicast when running the tests
- you can try setting this to 'false', although typically
- that won't be helpful.
- -->
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
- </systemProperties>
- <skipExec>${skipUnitTests}</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <skipUnitTests>true</skipUnitTests>
- <!--
- Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
- may be problems with multicast on the interface JGroups uses by default on your machine. You can
- try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
- setting the value to an interface where you know multicast works
- -->
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </properties>
-
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <skipUnitTests>false</skipUnitTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml (from rev 14419, core/trunk/cache-jbosscache2/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-jbosscache2/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,212 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache2</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache2.x Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>2.1.0.CR4</version>
+ </dependency>
+ <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core :( and needed for testing -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Skip a long-running test of a prototype class -->
+ <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>jgroups.bind_addr</name>
+ <value>${jgroups.bind_addr}</value>
+ </property>
+ <!-- There are problems with multicast and IPv6 on some
+ OS/JDK combos, so we tell Java to use IPv4. If you
+ have problems with multicast when running the tests
+ you can try setting this to 'false', although typically
+ that won't be helpful.
+ -->
+ <property>
+ <name>java.net.preferIPv4Stack</name>
+ <value>true</value>
+ </property>
+ <!-- Tell JGroups to only wait a short time for PING
+ responses before determining coordinator. Speeds cluster
+ formation during integration tests. (This is too
+ low a value for a real system; only use for tests.)
+ -->
+ <property>
+ <name>jgroups.ping.timeout</name>
+ <value>500</value>
+ </property>
+ <!-- Tell JGroups to only require one PING response
+ before determining coordinator. Speeds cluster
+ formation during integration tests. (This is too
+ low a value for a real system; only use for tests.)
+ -->
+ <property>
+ <name>jgroups.ping.num_initial_members</name>
+ <value>1</value>
+ </property>
+ <!-- Disable the JGroups message bundling feature
+ to speed tests and avoid FLUSH issue -->
+ <property>
+ <name>jgroups.udp.enable_bundling</name>
+ <value>false</value>
+ </property>
+ </systemProperties>
+ <skipExec>${skipUnitTests}</skipExec>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <skipUnitTests>true</skipUnitTests>
+ <!--
+ Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
+ may be problems with multicast on the interface JGroups uses by default on your machine. You can
+ try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
+ setting the value to an interface where you know multicast works
+ -->
+ <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <skipUnitTests>false</skipUnitTests>
+ </properties>
+ </profile>
+ </profiles>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,34 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate OSCache Integration</name>
- <description>Integration of Hibernate with OSCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml (from rev 14419, core/trunk/cache-oscache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-oscache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,38 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate OSCache Integration</name>
+ <description>Integration of Hibernate with OSCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,34 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate SwarmCache Integration</name>
- <description>Integration of Hibernate with SwarmCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>swarmcache</groupId>
- <artifactId>swarmcache</artifactId>
- <version>1.0RC2</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml (from rev 14419, core/trunk/cache-swarmcache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/cache-swarmcache/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,38 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate SwarmCache Integration</name>
+ <description>Integration of Hibernate with SwarmCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>swarmcache</groupId>
+ <artifactId>swarmcache</artifactId>
+ <version>1.0RC2</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,34 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate C3P0 ConnectionProvider</name>
- <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml (from rev 14419, core/trunk/connection-c3p0/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/connection-c3p0/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,38 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate C3P0 ConnectionProvider</name>
+ <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,34 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-proxool</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Proxool ConnectionProvider</name>
- <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>proxool</groupId>
- <artifactId>proxool</artifactId>
- <version>0.8.3</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml (from rev 14419, core/trunk/connection-proxool/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/connection-proxool/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,38 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-proxool</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Proxool ConnectionProvider</name>
+ <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ <version>0.8.3</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Copied: core/tags/hibernate-3.3.0.Alpha1/core (from rev 14306, core/trunk/core)
Deleted: core/tags/hibernate-3.3.0.Alpha1/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2008-02-02 07:51:59 UTC (rev 14306)
+++ core/tags/hibernate-3.3.0.Alpha1/core/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,147 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Core</name>
- <description>The core functionality of Hibernate</description>
-
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
-
- <dependency>
- <!-- YUCK, YUCK, YUCK!!!! -->
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.security</groupId>
- <artifactId>jaas</artifactId>
- <version>1.0.01</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.security</groupId>
- <artifactId>jacc</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- optional deps for bytecode providers until those are finally properly scoped -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>antlr-maven-plugin</artifactId>
- <version>${antlrPluginVersion}</version>
- <configuration>
- <grammars>hql.g,hql-sql.g,sql-gen.g</grammars>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>antlr-maven-plugin</artifactId>
- <version>${antlrPluginVersion}</version>
- <configuration>
- <!-- eventually should be based on the second phase grammar -->
- <grammars>hql.g</grammars>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!--
- for the time being, gonna ignore the custom stylesheet (what did it do anyway???)
- <stylesheetfile>xyz</stylesheetfile>
- -->
- <groups>
- <group>
- <title>Core API</title>
- <packages>org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype</packages>
- </group>
- <group>
- <title>Extension API</title>
- <packages>org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc</packages>
- </group>
- <group>
- <title>Miscellaneous API</title>
- <packages>org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument</packages>
- </group>
- <group>
- <title>Internal Implementation</title>
- <packages>org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <antlrPluginVersion>2.1-SNAPSHOT</antlrPluginVersion>
- </properties>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/core/pom.xml (from rev 14419, core/trunk/core/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/core/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/core/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,151 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Core</name>
+ <description>The core functionality of Hibernate</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- YUCK, YUCK, YUCK!!!! -->
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ <version>1.0.01</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- optional deps for bytecode providers until those are finally properly scoped -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>${antlrPluginVersion}</version>
+ <configuration>
+ <grammars>hql.g,hql-sql.g,sql-gen.g</grammars>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>${antlrPluginVersion}</version>
+ <configuration>
+ <!-- eventually should be based on the second phase grammar -->
+ <grammars>hql.g</grammars>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!--
+ for the time being, gonna ignore the custom stylesheet (what did it do anyway???)
+ <stylesheetfile>xyz</stylesheetfile>
+ -->
+ <groups>
+ <group>
+ <title>Core API</title>
+ <packages>org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype</packages>
+ </group>
+ <group>
+ <title>Extension API</title>
+ <packages>org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc</packages>
+ </group>
+ <group>
+ <title>Miscellaneous API</title>
+ <packages>org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument</packages>
+ </group>
+ <group>
+ <title>Internal Implementation</title>
+ <packages>org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <antlrPluginVersion>2.1</antlrPluginVersion>
+ </properties>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/DialectFactory.java 2008-02-02 07:51:59 UTC (rev 14306)
+++ core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,151 +0,0 @@
-// $Id: DialectFactory.java 9789 2006-04-25 17:06:55Z epbernard $
-package org.hibernate.dialect;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
-import org.hibernate.util.ReflectHelper;
-
-/**
- * A factory for generating Dialect instances.
- *
- * @author Steve Ebersole
- */
-public class DialectFactory {
-
- /**
- * Builds an appropriate Dialect instance.
- * <p/>
- * If a dialect is explicitly named in the incoming properties, it is used. Otherwise, the database name and version
- * (obtained from connection metadata) are used to make the dertemination.
- * <p/>
- * An exception is thrown if a dialect was not explicitly set and the database name is not known.
- *
- * @param props The configuration properties.
- * @param databaseName The name of the database product (obtained from metadata).
- * @param databaseMajorVersion The major version of the database product (obtained from metadata).
- *
- * @return The appropriate dialect.
- *
- * @throws HibernateException No dialect specified and database name not known.
- */
- public static Dialect buildDialect(Properties props, String databaseName, int databaseMajorVersion)
- throws HibernateException {
- String dialectName = props.getProperty( Environment.DIALECT );
- if ( dialectName == null ) {
- return determineDialect( databaseName, databaseMajorVersion );
- }
- else {
- return buildDialect( dialectName );
- }
- }
-
- /**
- * Determine the appropriate Dialect to use given the database product name
- * and major version.
- *
- * @param databaseName The name of the database product (obtained from metadata).
- * @param databaseMajorVersion The major version of the database product (obtained from metadata).
- *
- * @return An appropriate dialect instance.
- */
- public static Dialect determineDialect(String databaseName, int databaseMajorVersion) {
- if ( databaseName == null ) {
- throw new HibernateException( "Hibernate Dialect must be explicitly set" );
- }
-
- DatabaseDialectMapper mapper = ( DatabaseDialectMapper ) MAPPERS.get( databaseName );
- if ( mapper == null ) {
- throw new HibernateException( "Hibernate Dialect must be explicitly set for database: " + databaseName );
- }
-
- String dialectName = mapper.getDialectClass( databaseMajorVersion );
- return buildDialect( dialectName );
- }
-
- /**
- * Returns a dialect instance given the name of the class to use.
- *
- * @param dialectName The name of the dialect class.
- *
- * @return The dialect instance.
- */
- public static Dialect buildDialect(String dialectName) {
- try {
- return ( Dialect ) ReflectHelper.classForName( dialectName ).newInstance();
- }
- catch ( ClassNotFoundException cnfe ) {
- throw new HibernateException( "Dialect class not found: " + dialectName );
- }
- catch ( Exception e ) {
- throw new HibernateException( "Could not instantiate dialect class", e );
- }
- }
-
- /**
- * For a given database product name, instances of
- * DatabaseDialectMapper know which Dialect to use for different versions.
- */
- public static interface DatabaseDialectMapper {
- public String getDialectClass(int majorVersion);
- }
-
- /**
- * A simple DatabaseDialectMapper for dialects which are independent
- * of the underlying database product version.
- */
- public static class VersionInsensitiveMapper implements DatabaseDialectMapper {
- private String dialectClassName;
-
- public VersionInsensitiveMapper(String dialectClassName) {
- this.dialectClassName = dialectClassName;
- }
-
- public String getDialectClass(int majorVersion) {
- return dialectClassName;
- }
- }
-
- // TODO : this is the stuff it'd be nice to move to a properties file or some other easily user-editable place
- private static final Map MAPPERS = new HashMap();
- static {
- MAPPERS.put( "HSQL Database Engine", new VersionInsensitiveMapper( "org.hibernate.dialect.HSQLDialect" ) );
- MAPPERS.put( "H2", new VersionInsensitiveMapper( "org.hibernate.dialect.H2Dialect" ) );
- MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.hibernate.dialect.MySQLDialect" ) );
- MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.hibernate.dialect.PostgreSQLDialect" ) );
- MAPPERS.put( "Apache Derby", new VersionInsensitiveMapper( "org.hibernate.dialect.DerbyDialect" ) );
-
- MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.hibernate.dialect.SQLServerDialect" ) );
- MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.hibernate.dialect.SQLServerDialect" ) );
- MAPPERS.put( "Sybase SQL Server", new VersionInsensitiveMapper( "org.hibernate.dialect.SybaseDialect" ) );
- MAPPERS.put( "Adaptive Server Enterprise", new VersionInsensitiveMapper( "org.hibernate.dialect.SybaseDialect" ) );
-
- MAPPERS.put( "Informix Dynamic Server", new VersionInsensitiveMapper( "org.hibernate.dialect.InformixDialect" ) );
-
- // thanks goodness for "universal" databases...
- MAPPERS.put( "DB2/NT", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
- MAPPERS.put( "DB2/LINUX", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
- MAPPERS.put( "DB2/6000", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
- MAPPERS.put( "DB2/HPUX", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
- MAPPERS.put( "DB2/SUN", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
- MAPPERS.put( "DB2/LINUX390", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
- MAPPERS.put( "DB2/AIX64", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
-
- MAPPERS.put(
- "Oracle",
- new DatabaseDialectMapper() {
- public String getDialectClass(int majorVersion) {
- switch ( majorVersion ) {
- case 8: return Oracle8iDialect.class.getName();
- case 9: return Oracle9iDialect.class.getName();
- case 10: return Oracle10gDialect.class.getName();
- default: throw new HibernateException( "unknown Oracle major version [" + majorVersion + "]" );
- }
- }
- }
- );
- }
-}
Copied: core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java (from rev 14317, core/trunk/core/src/main/java/org/hibernate/dialect/DialectFactory.java)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/dialect/DialectFactory.java 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,156 @@
+// $Id: DialectFactory.java 9789 2006-04-25 17:06:55Z epbernard $
+package org.hibernate.dialect;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.hibernate.HibernateException;
+import org.hibernate.cfg.Environment;
+import org.hibernate.util.ReflectHelper;
+
+/**
+ * A factory for generating Dialect instances.
+ *
+ * @author Steve Ebersole
+ */
+public class DialectFactory {
+
+ /**
+ * Builds an appropriate Dialect instance.
+ * <p/>
+ * If a dialect is explicitly named in the incoming properties, it is used. Otherwise, the database name and version
+ * (obtained from connection metadata) are used to make the dertemination.
+ * <p/>
+ * An exception is thrown if a dialect was not explicitly set and the database name is not known.
+ *
+ * @param props The configuration properties.
+ * @param databaseName The name of the database product (obtained from metadata).
+ * @param databaseMajorVersion The major version of the database product (obtained from metadata).
+ *
+ * @return The appropriate dialect.
+ *
+ * @throws HibernateException No dialect specified and database name not known.
+ */
+ public static Dialect buildDialect(Properties props, String databaseName, int databaseMajorVersion)
+ throws HibernateException {
+ String dialectName = props.getProperty( Environment.DIALECT );
+ if ( dialectName == null ) {
+ return determineDialect( databaseName, databaseMajorVersion );
+ }
+ else {
+ return buildDialect( dialectName );
+ }
+ }
+
+ /**
+ * Determine the appropriate Dialect to use given the database product name
+ * and major version.
+ *
+ * @param databaseName The name of the database product (obtained from metadata).
+ * @param databaseMajorVersion The major version of the database product (obtained from metadata).
+ *
+ * @return An appropriate dialect instance.
+ */
+ public static Dialect determineDialect(String databaseName, int databaseMajorVersion) {
+ if ( databaseName == null ) {
+ throw new HibernateException( "Hibernate Dialect must be explicitly set" );
+ }
+
+ DatabaseDialectMapper mapper = ( DatabaseDialectMapper ) MAPPERS.get( databaseName );
+ if ( mapper == null ) {
+ throw new HibernateException( "Hibernate Dialect must be explicitly set for database: " + databaseName );
+ }
+
+ String dialectName = mapper.getDialectClass( databaseMajorVersion );
+ return buildDialect( dialectName );
+ }
+
+ /**
+ * Returns a dialect instance given the name of the class to use.
+ *
+ * @param dialectName The name of the dialect class.
+ *
+ * @return The dialect instance.
+ */
+ public static Dialect buildDialect(String dialectName) {
+ try {
+ return ( Dialect ) ReflectHelper.classForName( dialectName ).newInstance();
+ }
+ catch ( ClassNotFoundException cnfe ) {
+ throw new HibernateException( "Dialect class not found: " + dialectName );
+ }
+ catch ( Exception e ) {
+ throw new HibernateException( "Could not instantiate dialect class", e );
+ }
+ }
+
+ /**
+ * For a given database product name, instances of
+ * DatabaseDialectMapper know which Dialect to use for different versions.
+ */
+ public static interface DatabaseDialectMapper {
+ public String getDialectClass(int majorVersion);
+ }
+
+ /**
+ * A simple DatabaseDialectMapper for dialects which are independent
+ * of the underlying database product version.
+ */
+ public static class VersionInsensitiveMapper implements DatabaseDialectMapper {
+ private String dialectClassName;
+
+ public VersionInsensitiveMapper(String dialectClassName) {
+ this.dialectClassName = dialectClassName;
+ }
+
+ public String getDialectClass(int majorVersion) {
+ return dialectClassName;
+ }
+ }
+
+ // TODO : this is the stuff it'd be nice to move to a properties file or some other easily user-editable place
+ private static final Map MAPPERS = new HashMap();
+ static {
+ // detectors...
+ MAPPERS.put( "HSQL Database Engine", new VersionInsensitiveMapper( "org.hibernate.dialect.HSQLDialect" ) );
+ MAPPERS.put( "H2", new VersionInsensitiveMapper( "org.hibernate.dialect.H2Dialect" ) );
+ MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.hibernate.dialect.MySQLDialect" ) );
+ MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.hibernate.dialect.PostgreSQLDialect" ) );
+ MAPPERS.put( "Apache Derby", new VersionInsensitiveMapper( "org.hibernate.dialect.DerbyDialect" ) );
+
+ MAPPERS.put( "Ingres", new VersionInsensitiveMapper( "org.hibernate.dialect.IngresDialect" ) );
+ MAPPERS.put( "ingres", new VersionInsensitiveMapper( "org.hibernate.dialect.IngresDialect" ) );
+ MAPPERS.put( "INGRES", new VersionInsensitiveMapper( "org.hibernate.dialect.IngresDialect" ) );
+
+ MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.hibernate.dialect.SQLServerDialect" ) );
+ MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.hibernate.dialect.SQLServerDialect" ) );
+ MAPPERS.put( "Sybase SQL Server", new VersionInsensitiveMapper( "org.hibernate.dialect.SybaseDialect" ) );
+ MAPPERS.put( "Adaptive Server Enterprise", new VersionInsensitiveMapper( "org.hibernate.dialect.SybaseDialect" ) );
+
+ MAPPERS.put( "Informix Dynamic Server", new VersionInsensitiveMapper( "org.hibernate.dialect.InformixDialect" ) );
+
+ // thanks goodness for "universal" databases...
+ MAPPERS.put( "DB2/NT", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/LINUX", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/6000", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/HPUX", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/SUN", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/LINUX390", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/AIX64", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) );
+
+ MAPPERS.put(
+ "Oracle",
+ new DatabaseDialectMapper() {
+ public String getDialectClass(int majorVersion) {
+ switch ( majorVersion ) {
+ case 8: return Oracle8iDialect.class.getName();
+ case 9: return Oracle9iDialect.class.getName();
+ case 10: return Oracle10gDialect.class.getName();
+ default: throw new HibernateException( "unknown Oracle major version [" + majorVersion + "]" );
+ }
+ }
+ }
+ );
+ }
+}
Deleted: core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/ActionQueue.java 2008-02-02 07:51:59 UTC (rev 14306)
+++ core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,531 +0,0 @@
-// $Id: ActionQueue.java 11402 2007-04-11 14:24:35Z steve.ebersole(a)jboss.com $
-package org.hibernate.engine;
-
-import org.hibernate.action.EntityInsertAction;
-import org.hibernate.action.EntityDeleteAction;
-import org.hibernate.action.Executable;
-import org.hibernate.action.EntityUpdateAction;
-import org.hibernate.action.CollectionRecreateAction;
-import org.hibernate.action.CollectionRemoveAction;
-import org.hibernate.action.CollectionUpdateAction;
-import org.hibernate.action.EntityIdentityInsertAction;
-import org.hibernate.action.BulkOperationCleanupAction;
-import org.hibernate.HibernateException;
-import org.hibernate.AssertionFailure;
-import org.hibernate.cache.CacheException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-
-/**
- * Responsible for maintaining the queue of actions related to events.
- * </p>
- * The ActionQueue holds the DML operations queued as part of a session's
- * transactional-write-behind semantics. DML operations are queued here
- * until a flush forces them to be executed against the database.
- *
- * @author Steve Ebersole
- */
-public class ActionQueue {
-
- private static final Logger log = LoggerFactory.getLogger( ActionQueue.class );
- private static final int INIT_QUEUE_LIST_SIZE = 5;
-
- private SessionImplementor session;
-
- // Object insertions, updates, and deletions have list semantics because
- // they must happen in the right order so as to respect referential
- // integrity
- private ArrayList insertions;
- private ArrayList deletions;
- private ArrayList updates;
- // Actually the semantics of the next three are really "Bag"
- // Note that, unlike objects, collection insertions, updates,
- // deletions are not really remembered between flushes. We
- // just re-use the same Lists for convenience.
- private ArrayList collectionCreations;
- private ArrayList collectionUpdates;
- private ArrayList collectionRemovals;
-
- private ArrayList executions;
-
- /**
- * Constructs an action queue bound to the given session.
- *
- * @param session The session "owning" this queue.
- */
- public ActionQueue(SessionImplementor session) {
- this.session = session;
- init();
- }
-
- private void init() {
- insertions = new ArrayList( INIT_QUEUE_LIST_SIZE );
- deletions = new ArrayList( INIT_QUEUE_LIST_SIZE );
- updates = new ArrayList( INIT_QUEUE_LIST_SIZE );
-
- collectionCreations = new ArrayList( INIT_QUEUE_LIST_SIZE );
- collectionRemovals = new ArrayList( INIT_QUEUE_LIST_SIZE );
- collectionUpdates = new ArrayList( INIT_QUEUE_LIST_SIZE );
-
- executions = new ArrayList( INIT_QUEUE_LIST_SIZE * 3 );
- }
-
- public void clear() {
- updates.clear();
- insertions.clear();
- deletions.clear();
-
- collectionCreations.clear();
- collectionRemovals.clear();
- collectionUpdates.clear();
- }
-
- public void addAction(EntityInsertAction action) {
- insertions.add( action );
- }
-
- public void addAction(EntityDeleteAction action) {
- deletions.add( action );
- }
-
- public void addAction(EntityUpdateAction action) {
- updates.add( action );
- }
-
- public void addAction(CollectionRecreateAction action) {
- collectionCreations.add( action );
- }
-
- public void addAction(CollectionRemoveAction action) {
- collectionRemovals.add( action );
- }
-
- public void addAction(CollectionUpdateAction action) {
- collectionUpdates.add( action );
- }
-
- public void addAction(EntityIdentityInsertAction insert) {
- insertions.add( insert );
- }
-
- public void addAction(BulkOperationCleanupAction cleanupAction) {
- // Add these directly to the executions queue
- executions.add( cleanupAction );
- }
-
- /**
- * Perform all currently queued entity-insertion actions.
- *
- * @throws HibernateException error executing queued insertion actions.
- */
- public void executeInserts() throws HibernateException {
- executeActions( insertions );
- }
-
- /**
- * Perform all currently queued actions.
- *
- * @throws HibernateException error executing queued actions.
- */
- public void executeActions() throws HibernateException {
- executeActions( insertions );
- executeActions( updates );
- executeActions( collectionRemovals );
- executeActions( collectionUpdates );
- executeActions( collectionCreations );
- executeActions( deletions );
- }
-
- /**
- * Prepares the internal action queues for execution.
- *
- * @throws HibernateException error preparing actions.
- */
- public void prepareActions() throws HibernateException {
- prepareActions( collectionRemovals );
- prepareActions( collectionUpdates );
- prepareActions( collectionCreations );
- }
-
- /**
- * Performs cleanup of any held cache softlocks.
- *
- * @param success Was the transaction successful.
- */
- public void afterTransactionCompletion(boolean success) {
- int size = executions.size();
- final boolean invalidateQueryCache = session.getFactory().getSettings().isQueryCacheEnabled();
- for ( int i = 0; i < size; i++ ) {
- try {
- Executable exec = ( Executable ) executions.get(i);
- try {
- exec.afterTransactionCompletion( success );
- }
- finally {
- if ( invalidateQueryCache ) {
- session.getFactory().getUpdateTimestampsCache().invalidate( exec.getPropertySpaces() );
- }
- }
- }
- catch (CacheException ce) {
- log.error( "could not release a cache lock", ce );
- // continue loop
- }
- catch (Exception e) {
- throw new AssertionFailure( "Exception releasing cache locks", e );
- }
- }
- executions.clear();
- }
-
- /**
- * Check whether the given tables/query-spaces are to be executed against
- * given the currently queued actions.
- *
- * @param tables The table/query-spaces to check.
- * @return True if we contain pending actions against any of the given
- * tables; false otherwise.
- */
- public boolean areTablesToBeUpdated(Set tables) {
- return areTablesToUpdated( updates, tables ) ||
- areTablesToUpdated( insertions, tables ) ||
- areTablesToUpdated( deletions, tables ) ||
- areTablesToUpdated( collectionUpdates, tables ) ||
- areTablesToUpdated( collectionCreations, tables ) ||
- areTablesToUpdated( collectionRemovals, tables );
- }
-
- /**
- * Check whether any insertion or deletion actions are currently queued.
- *
- * @return True if insertions or deletions are currently queued; false otherwise.
- */
- public boolean areInsertionsOrDeletionsQueued() {
- return ( insertions.size() > 0 || deletions.size() > 0 );
- }
-
- private static boolean areTablesToUpdated(List executables, Set tablespaces) {
- int size = executables.size();
- for ( int j = 0; j < size; j++ ) {
- Serializable[] spaces = ( (Executable) executables.get(j) ).getPropertySpaces();
- for ( int i = 0; i < spaces.length; i++ ) {
- if ( tablespaces.contains( spaces[i] ) ) {
- if ( log.isDebugEnabled() ) log.debug( "changes must be flushed to space: " + spaces[i] );
- return true;
- }
- }
- }
- return false;
- }
-
- private void executeActions(List list) throws HibernateException {
- int size = list.size();
- for ( int i = 0; i < size; i++ ) {
- execute( (Executable) list.get(i) );
- }
- list.clear();
- session.getBatcher().executeBatch();
- }
-
- public void execute(Executable executable) {
- final boolean lockQueryCache = session.getFactory().getSettings().isQueryCacheEnabled();
- if ( executable.hasAfterTransactionCompletion() || lockQueryCache ) {
- executions.add( executable );
- }
- if (lockQueryCache) {
- session.getFactory()
- .getUpdateTimestampsCache()
- .preinvalidate( executable.getPropertySpaces() );
- }
- executable.execute();
- }
-
- private void prepareActions(List queue) throws HibernateException {
- int size = queue.size();
- for ( int i=0; i<size; i++ ) {
- Executable executable = ( Executable ) queue.get(i);
- executable.beforeExecutions();
- }
- }
-
- /**
- * Returns a string representation of the object.
- *
- * @return a string representation of the object.
- */
- public String toString() {
- return new StringBuffer()
- .append("ActionQueue[insertions=").append(insertions)
- .append(" updates=").append(updates)
- .append(" deletions=").append(deletions)
- .append(" collectionCreations=").append(collectionCreations)
- .append(" collectionRemovals=").append(collectionRemovals)
- .append(" collectionUpdates=").append(collectionUpdates)
- .append("]")
- .toString();
- }
-
- public int numberOfCollectionRemovals() {
- return collectionRemovals.size();
- }
-
- public int numberOfCollectionUpdates() {
- return collectionUpdates.size();
- }
-
- public int numberOfCollectionCreations() {
- return collectionCreations.size();
- }
-
- public int numberOfDeletions() {
- return deletions.size();
- }
-
- public int numberOfUpdates() {
- return updates.size();
- }
-
- public int numberOfInsertions() {
- return insertions.size();
- }
-
- public void sortCollectionActions() {
- if ( session.getFactory().getSettings().isOrderUpdatesEnabled() ) {
- //sort the updates by fk
- java.util.Collections.sort( collectionCreations );
- java.util.Collections.sort( collectionUpdates );
- java.util.Collections.sort( collectionRemovals );
- }
- }
-
- public void sortActions() {
- if ( session.getFactory().getSettings().isOrderUpdatesEnabled() ) {
- //sort the updates by pk
- java.util.Collections.sort( updates );
- }
- if ( session.getFactory().getSettings().isOrderInsertsEnabled() ) {
- sortInsertActions();
- }
- }
-
- /**
- * Provided the option is set ({@link org.hibernate.cfg.Environment#ORDER_INSERTS}),
- * then order the {@link #insertions} queue such that we group inserts
- * against the same entity together (without violating constraints). The
- * original order is generated by cascade order, which in turn is based on
- * the directionality of foreign-keys. So even though we will be changing
- * the ordering here, we need to make absolutely certain that we do not
- * circumvent this FK ordering to the extent of causing constraint
- * violations
- */
- private void sortInsertActions() {
- // IMPLEMENTATION NOTES:
- //
- // The main data structure in this ordering algorithm is the 'positionToAction'
- // map. Essentially this can be thought of as an put-ordered map (the problem with
- // actually implementing it that way and doing away with the 'nameList' is that
- // we'd end up having potential duplicate key values). 'positionToAction' maitains
- // a mapping from a position within the 'nameList' structure to a "partial queue"
- // of actions.
-
- HashMap positionToAction = new HashMap();
- List nameList = new ArrayList();
-
- loopInsertion: while( !insertions.isEmpty() ) {
- EntityInsertAction action = ( EntityInsertAction ) insertions.remove( 0 );
- String thisEntityName = action.getEntityName();
-
- // see if we have already encountered this entity-name...
- if ( ! nameList.contains( thisEntityName ) ) {
- // we have not, so create the proper entries in nameList and positionToAction
- ArrayList segmentedActionQueue = new ArrayList();
- segmentedActionQueue.add( action );
- nameList.add( thisEntityName );
- positionToAction.put( new Integer( nameList.indexOf( thisEntityName ) ), segmentedActionQueue );
- }
- else {
- // we have seen it before, so we need to determine if this insert action is
- // is depenedent upon a previously processed action in terms of FK
- // relationships (this FK checking is done against the entity's property-state
- // associated with the action...)
- int lastPos = nameList.lastIndexOf( thisEntityName );
- Object[] states = action.getState();
- for ( int i = 0; i < states.length; i++ ) {
- for ( int j = 0; j < nameList.size(); j++ ) {
- ArrayList tmpList = ( ArrayList ) positionToAction.get( new Integer( j ) );
- for ( int k = 0; k < tmpList.size(); k++ ) {
- final EntityInsertAction checkAction = ( EntityInsertAction ) tmpList.get( k );
- if ( checkAction.getInstance() == states[i] && j > lastPos ) {
- // 'checkAction' is inserting an entity upon which 'action'
- // depends...
- // note: this is an assumption and may not be correct in the case of one-to-one
- ArrayList segmentedActionQueue = new ArrayList();
- segmentedActionQueue.add( action );
- nameList.add( thisEntityName );
- positionToAction.put(new Integer( nameList.lastIndexOf( thisEntityName ) ), segmentedActionQueue );
- continue loopInsertion;
- }
- }
- }
- }
-
- ArrayList actionQueue = ( ArrayList ) positionToAction.get( new Integer( lastPos ) );
- actionQueue.add( action );
- }
- }
-
- // now iterate back through positionToAction map and move entityInsertAction back to insertion list
- for ( int p = 0; p < nameList.size(); p++ ) {
- ArrayList actionQueue = ( ArrayList ) positionToAction.get( new Integer( p ) );
- Iterator itr = actionQueue.iterator();
- while ( itr.hasNext() ) {
- insertions.add( itr.next() );
- }
- }
- }
-
- public ArrayList cloneDeletions() {
- return (ArrayList) deletions.clone();
- }
-
- public void clearFromFlushNeededCheck(int previousCollectionRemovalSize) {
- collectionCreations.clear();
- collectionUpdates.clear();
- updates.clear();
- // collection deletions are a special case since update() can add
- // deletions of collections not loaded by the session.
- for ( int i = collectionRemovals.size()-1; i >= previousCollectionRemovalSize; i-- ) {
- collectionRemovals.remove(i);
- }
- }
-
- public boolean hasAnyQueuedActions() {
- return updates.size() > 0 ||
- insertions.size() > 0 ||
- deletions.size() > 0 ||
- collectionUpdates.size() > 0 ||
- collectionRemovals.size() > 0 ||
- collectionCreations.size() > 0;
- }
-
- /**
- * Used by the owning session to explicitly control serialization of the
- * action queue
- *
- * @param oos The stream to which the action queue should get written
- * @throws IOException
- */
- public void serialize(ObjectOutputStream oos) throws IOException {
- log.trace( "serializing action-queue" );
-
- int queueSize = insertions.size();
- log.trace( "starting serialization of [" + queueSize + "] insertions entries" );
- oos.writeInt( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- oos.writeObject( insertions.get( i ) );
- }
-
- queueSize = deletions.size();
- log.trace( "starting serialization of [" + queueSize + "] deletions entries" );
- oos.writeInt( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- oos.writeObject( deletions.get( i ) );
- }
-
- queueSize = updates.size();
- log.trace( "starting serialization of [" + queueSize + "] updates entries" );
- oos.writeInt( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- oos.writeObject( updates.get( i ) );
- }
-
- queueSize = collectionUpdates.size();
- log.trace( "starting serialization of [" + queueSize + "] collectionUpdates entries" );
- oos.writeInt( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- oos.writeObject( collectionUpdates.get( i ) );
- }
-
- queueSize = collectionRemovals.size();
- log.trace( "starting serialization of [" + queueSize + "] collectionRemovals entries" );
- oos.writeInt( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- oos.writeObject( collectionRemovals.get( i ) );
- }
-
- queueSize = collectionCreations.size();
- log.trace( "starting serialization of [" + queueSize + "] collectionCreations entries" );
- oos.writeInt( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- oos.writeObject( collectionCreations.get( i ) );
- }
- }
-
- /**
- * Used by the owning session to explicitly control deserialization of the
- * action queue
- *
- * @param ois The stream from which to read the action queue
- * @throws IOException
- */
- public static ActionQueue deserialize(
- ObjectInputStream ois,
- SessionImplementor session) throws IOException, ClassNotFoundException {
- log.trace( "deserializing action-queue" );
- ActionQueue rtn = new ActionQueue( session );
-
- int queueSize = ois.readInt();
- log.trace( "starting deserialization of [" + queueSize + "] insertions entries" );
- rtn.insertions = new ArrayList( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- rtn.insertions.add( ois.readObject() );
- }
-
- queueSize = ois.readInt();
- log.trace( "starting deserialization of [" + queueSize + "] deletions entries" );
- rtn.deletions = new ArrayList( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- rtn.deletions.add( ois.readObject() );
- }
-
- queueSize = ois.readInt();
- log.trace( "starting deserialization of [" + queueSize + "] updates entries" );
- rtn.updates = new ArrayList( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- rtn.updates.add( ois.readObject() );
- }
-
- queueSize = ois.readInt();
- log.trace( "starting deserialization of [" + queueSize + "] collectionUpdates entries" );
- rtn.collectionUpdates = new ArrayList( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- rtn.collectionUpdates.add( ois.readObject() );
- }
-
- queueSize = ois.readInt();
- log.trace( "starting deserialization of [" + queueSize + "] collectionRemovals entries" );
- rtn.collectionRemovals = new ArrayList( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- rtn.collectionRemovals.add( ois.readObject() );
- }
-
- queueSize = ois.readInt();
- log.trace( "starting deserialization of [" + queueSize + "] collectionCreations entries" );
- rtn.collectionCreations = new ArrayList( queueSize );
- for ( int i = 0; i < queueSize; i++ ) {
- rtn.collectionCreations.add( ois.readObject() );
- }
- return rtn;
- }
-
-}
Copied: core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java (from rev 14356, core/trunk/core/src/main/java/org/hibernate/engine/ActionQueue.java)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/engine/ActionQueue.java 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,619 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * 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, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ *
+ */
+package org.hibernate.engine;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.hibernate.AssertionFailure;
+import org.hibernate.HibernateException;
+import org.hibernate.action.BulkOperationCleanupAction;
+import org.hibernate.action.CollectionRecreateAction;
+import org.hibernate.action.CollectionRemoveAction;
+import org.hibernate.action.CollectionUpdateAction;
+import org.hibernate.action.EntityDeleteAction;
+import org.hibernate.action.EntityIdentityInsertAction;
+import org.hibernate.action.EntityInsertAction;
+import org.hibernate.action.EntityUpdateAction;
+import org.hibernate.action.Executable;
+import org.hibernate.cache.CacheException;
+import org.hibernate.type.Type;
+
+/**
+ * Responsible for maintaining the queue of actions related to events.
+ * </p>
+ * The ActionQueue holds the DML operations queued as part of a session's
+ * transactional-write-behind semantics. DML operations are queued here
+ * until a flush forces them to be executed against the database.
+ *
+ * @author Steve Ebersole
+ */
+public class ActionQueue {
+
+ private static final Logger log = LoggerFactory.getLogger( ActionQueue.class );
+ private static final int INIT_QUEUE_LIST_SIZE = 5;
+
+ private SessionImplementor session;
+
+ // Object insertions, updates, and deletions have list semantics because
+ // they must happen in the right order so as to respect referential
+ // integrity
+ private ArrayList insertions;
+ private ArrayList deletions;
+ private ArrayList updates;
+ // Actually the semantics of the next three are really "Bag"
+ // Note that, unlike objects, collection insertions, updates,
+ // deletions are not really remembered between flushes. We
+ // just re-use the same Lists for convenience.
+ private ArrayList collectionCreations;
+ private ArrayList collectionUpdates;
+ private ArrayList collectionRemovals;
+
+ private ArrayList executions;
+
+ /**
+ * Constructs an action queue bound to the given session.
+ *
+ * @param session The session "owning" this queue.
+ */
+ public ActionQueue(SessionImplementor session) {
+ this.session = session;
+ init();
+ }
+
+ private void init() {
+ insertions = new ArrayList( INIT_QUEUE_LIST_SIZE );
+ deletions = new ArrayList( INIT_QUEUE_LIST_SIZE );
+ updates = new ArrayList( INIT_QUEUE_LIST_SIZE );
+
+ collectionCreations = new ArrayList( INIT_QUEUE_LIST_SIZE );
+ collectionRemovals = new ArrayList( INIT_QUEUE_LIST_SIZE );
+ collectionUpdates = new ArrayList( INIT_QUEUE_LIST_SIZE );
+
+ executions = new ArrayList( INIT_QUEUE_LIST_SIZE * 3 );
+ }
+
+ public void clear() {
+ updates.clear();
+ insertions.clear();
+ deletions.clear();
+
+ collectionCreations.clear();
+ collectionRemovals.clear();
+ collectionUpdates.clear();
+ }
+
+ public void addAction(EntityInsertAction action) {
+ insertions.add( action );
+ }
+
+ public void addAction(EntityDeleteAction action) {
+ deletions.add( action );
+ }
+
+ public void addAction(EntityUpdateAction action) {
+ updates.add( action );
+ }
+
+ public void addAction(CollectionRecreateAction action) {
+ collectionCreations.add( action );
+ }
+
+ public void addAction(CollectionRemoveAction action) {
+ collectionRemovals.add( action );
+ }
+
+ public void addAction(CollectionUpdateAction action) {
+ collectionUpdates.add( action );
+ }
+
+ public void addAction(EntityIdentityInsertAction insert) {
+ insertions.add( insert );
+ }
+
+ public void addAction(BulkOperationCleanupAction cleanupAction) {
+ // Add these directly to the executions queue
+ executions.add( cleanupAction );
+ }
+
+ /**
+ * Perform all currently queued entity-insertion actions.
+ *
+ * @throws HibernateException error executing queued insertion actions.
+ */
+ public void executeInserts() throws HibernateException {
+ executeActions( insertions );
+ }
+
+ /**
+ * Perform all currently queued actions.
+ *
+ * @throws HibernateException error executing queued actions.
+ */
+ public void executeActions() throws HibernateException {
+ executeActions( insertions );
+ executeActions( updates );
+ executeActions( collectionRemovals );
+ executeActions( collectionUpdates );
+ executeActions( collectionCreations );
+ executeActions( deletions );
+ }
+
+ /**
+ * Prepares the internal action queues for execution.
+ *
+ * @throws HibernateException error preparing actions.
+ */
+ public void prepareActions() throws HibernateException {
+ prepareActions( collectionRemovals );
+ prepareActions( collectionUpdates );
+ prepareActions( collectionCreations );
+ }
+
+ /**
+ * Performs cleanup of any held cache softlocks.
+ *
+ * @param success Was the transaction successful.
+ */
+ public void afterTransactionCompletion(boolean success) {
+ int size = executions.size();
+ final boolean invalidateQueryCache = session.getFactory().getSettings().isQueryCacheEnabled();
+ for ( int i = 0; i < size; i++ ) {
+ try {
+ Executable exec = ( Executable ) executions.get( i );
+ try {
+ exec.afterTransactionCompletion( success );
+ }
+ finally {
+ if ( invalidateQueryCache ) {
+ session.getFactory().getUpdateTimestampsCache().invalidate( exec.getPropertySpaces() );
+ }
+ }
+ }
+ catch ( CacheException ce ) {
+ log.error( "could not release a cache lock", ce );
+ // continue loop
+ }
+ catch ( Exception e ) {
+ throw new AssertionFailure( "Exception releasing cache locks", e );
+ }
+ }
+ executions.clear();
+ }
+
+ /**
+ * Check whether the given tables/query-spaces are to be executed against
+ * given the currently queued actions.
+ *
+ * @param tables The table/query-spaces to check.
+ *
+ * @return True if we contain pending actions against any of the given
+ * tables; false otherwise.
+ */
+ public boolean areTablesToBeUpdated(Set tables) {
+ return areTablesToUpdated( updates, tables ) ||
+ areTablesToUpdated( insertions, tables ) ||
+ areTablesToUpdated( deletions, tables ) ||
+ areTablesToUpdated( collectionUpdates, tables ) ||
+ areTablesToUpdated( collectionCreations, tables ) ||
+ areTablesToUpdated( collectionRemovals, tables );
+ }
+
+ /**
+ * Check whether any insertion or deletion actions are currently queued.
+ *
+ * @return True if insertions or deletions are currently queued; false otherwise.
+ */
+ public boolean areInsertionsOrDeletionsQueued() {
+ return ( insertions.size() > 0 || deletions.size() > 0 );
+ }
+
+ private static boolean areTablesToUpdated(List executables, Set tablespaces) {
+ int size = executables.size();
+ for ( int j = 0; j < size; j++ ) {
+ Serializable[] spaces = ( ( Executable ) executables.get( j ) ).getPropertySpaces();
+ for ( int i = 0; i < spaces.length; i++ ) {
+ if ( tablespaces.contains( spaces[i] ) ) {
+ if ( log.isDebugEnabled() ) {
+ log.debug( "changes must be flushed to space: " + spaces[i] );
+ }
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private void executeActions(List list) throws HibernateException {
+ int size = list.size();
+ for ( int i = 0; i < size; i++ ) {
+ execute( ( Executable ) list.get( i ) );
+ }
+ list.clear();
+ session.getBatcher().executeBatch();
+ }
+
+ public void execute(Executable executable) {
+ final boolean lockQueryCache = session.getFactory().getSettings().isQueryCacheEnabled();
+ if ( executable.hasAfterTransactionCompletion() || lockQueryCache ) {
+ executions.add( executable );
+ }
+ if ( lockQueryCache ) {
+ session.getFactory()
+ .getUpdateTimestampsCache()
+ .preinvalidate( executable.getPropertySpaces() );
+ }
+ executable.execute();
+ }
+
+ private void prepareActions(List queue) throws HibernateException {
+ int size = queue.size();
+ for ( int i = 0; i < size; i++ ) {
+ Executable executable = ( Executable ) queue.get( i );
+ executable.beforeExecutions();
+ }
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return a string representation of the object.
+ */
+ public String toString() {
+ return new StringBuffer()
+ .append( "ActionQueue[insertions=" ).append( insertions )
+ .append( " updates=" ).append( updates )
+ .append( " deletions=" ).append( deletions )
+ .append( " collectionCreations=" ).append( collectionCreations )
+ .append( " collectionRemovals=" ).append( collectionRemovals )
+ .append( " collectionUpdates=" ).append( collectionUpdates )
+ .append( "]" )
+ .toString();
+ }
+
+ public int numberOfCollectionRemovals() {
+ return collectionRemovals.size();
+ }
+
+ public int numberOfCollectionUpdates() {
+ return collectionUpdates.size();
+ }
+
+ public int numberOfCollectionCreations() {
+ return collectionCreations.size();
+ }
+
+ public int numberOfDeletions() {
+ return deletions.size();
+ }
+
+ public int numberOfUpdates() {
+ return updates.size();
+ }
+
+ public int numberOfInsertions() {
+ return insertions.size();
+ }
+
+ public void sortCollectionActions() {
+ if ( session.getFactory().getSettings().isOrderUpdatesEnabled() ) {
+ //sort the updates by fk
+ java.util.Collections.sort( collectionCreations );
+ java.util.Collections.sort( collectionUpdates );
+ java.util.Collections.sort( collectionRemovals );
+ }
+ }
+
+ public void sortActions() {
+ if ( session.getFactory().getSettings().isOrderUpdatesEnabled() ) {
+ //sort the updates by pk
+ java.util.Collections.sort( updates );
+ }
+ if ( session.getFactory().getSettings().isOrderInsertsEnabled() ) {
+ sortInsertActions();
+ }
+ }
+
+ /**
+ * Order the {@link #insertions} queue such that we group inserts
+ * against the same entity together (without violating constraints). The
+ * original order is generated by cascade order, which in turn is based on
+ * the directionality of foreign-keys. So even though we will be changing
+ * the ordering here, we need to make absolutely certain that we do not
+ * circumvent this FK ordering to the extent of causing constraint
+ * violations
+ */
+ private void sortInsertActions() {
+ new InsertActionSorter().sort();
+ }
+
+ public ArrayList cloneDeletions() {
+ return ( ArrayList ) deletions.clone();
+ }
+
+ public void clearFromFlushNeededCheck(int previousCollectionRemovalSize) {
+ collectionCreations.clear();
+ collectionUpdates.clear();
+ updates.clear();
+ // collection deletions are a special case since update() can add
+ // deletions of collections not loaded by the session.
+ for ( int i = collectionRemovals.size() - 1; i >= previousCollectionRemovalSize; i-- ) {
+ collectionRemovals.remove( i );
+ }
+ }
+
+ public boolean hasAfterTransactionActions() {
+ return executions.size() > 0;
+ }
+
+ public boolean hasAnyQueuedActions() {
+ return updates.size() > 0 ||
+ insertions.size() > 0 ||
+ deletions.size() > 0 ||
+ collectionUpdates.size() > 0 ||
+ collectionRemovals.size() > 0 ||
+ collectionCreations.size() > 0;
+ }
+
+ /**
+ * Used by the owning session to explicitly control serialization of the
+ * action queue
+ *
+ * @param oos The stream to which the action queue should get written
+ *
+ * @throws IOException
+ */
+ public void serialize(ObjectOutputStream oos) throws IOException {
+ log.trace( "serializing action-queue" );
+
+ int queueSize = insertions.size();
+ log.trace( "starting serialization of [" + queueSize + "] insertions entries" );
+ oos.writeInt( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ oos.writeObject( insertions.get( i ) );
+ }
+
+ queueSize = deletions.size();
+ log.trace( "starting serialization of [" + queueSize + "] deletions entries" );
+ oos.writeInt( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ oos.writeObject( deletions.get( i ) );
+ }
+
+ queueSize = updates.size();
+ log.trace( "starting serialization of [" + queueSize + "] updates entries" );
+ oos.writeInt( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ oos.writeObject( updates.get( i ) );
+ }
+
+ queueSize = collectionUpdates.size();
+ log.trace( "starting serialization of [" + queueSize + "] collectionUpdates entries" );
+ oos.writeInt( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ oos.writeObject( collectionUpdates.get( i ) );
+ }
+
+ queueSize = collectionRemovals.size();
+ log.trace( "starting serialization of [" + queueSize + "] collectionRemovals entries" );
+ oos.writeInt( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ oos.writeObject( collectionRemovals.get( i ) );
+ }
+
+ queueSize = collectionCreations.size();
+ log.trace( "starting serialization of [" + queueSize + "] collectionCreations entries" );
+ oos.writeInt( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ oos.writeObject( collectionCreations.get( i ) );
+ }
+ }
+
+ /**
+ * Used by the owning session to explicitly control deserialization of the
+ * action queue
+ *
+ * @param ois The stream from which to read the action queue
+ *
+ * @throws IOException
+ */
+ public static ActionQueue deserialize(
+ ObjectInputStream ois,
+ SessionImplementor session) throws IOException, ClassNotFoundException {
+ log.trace( "deserializing action-queue" );
+ ActionQueue rtn = new ActionQueue( session );
+
+ int queueSize = ois.readInt();
+ log.trace( "starting deserialization of [" + queueSize + "] insertions entries" );
+ rtn.insertions = new ArrayList( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ rtn.insertions.add( ois.readObject() );
+ }
+
+ queueSize = ois.readInt();
+ log.trace( "starting deserialization of [" + queueSize + "] deletions entries" );
+ rtn.deletions = new ArrayList( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ rtn.deletions.add( ois.readObject() );
+ }
+
+ queueSize = ois.readInt();
+ log.trace( "starting deserialization of [" + queueSize + "] updates entries" );
+ rtn.updates = new ArrayList( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ rtn.updates.add( ois.readObject() );
+ }
+
+ queueSize = ois.readInt();
+ log.trace( "starting deserialization of [" + queueSize + "] collectionUpdates entries" );
+ rtn.collectionUpdates = new ArrayList( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ rtn.collectionUpdates.add( ois.readObject() );
+ }
+
+ queueSize = ois.readInt();
+ log.trace( "starting deserialization of [" + queueSize + "] collectionRemovals entries" );
+ rtn.collectionRemovals = new ArrayList( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ rtn.collectionRemovals.add( ois.readObject() );
+ }
+
+ queueSize = ois.readInt();
+ log.trace( "starting deserialization of [" + queueSize + "] collectionCreations entries" );
+ rtn.collectionCreations = new ArrayList( queueSize );
+ for ( int i = 0; i < queueSize; i++ ) {
+ rtn.collectionCreations.add( ois.readObject() );
+ }
+ return rtn;
+ }
+
+
+ /**
+ * Sorts the insert actions using more hashes.
+ *
+ * @author Jay Erb
+ */
+ private class InsertActionSorter {
+
+ // the mapping of entity names to their latest batch numbers.
+ private HashMap latestBatches = new HashMap();
+ private HashMap entityBatchNumber;
+
+ // the map of batch numbers to EntityInsertAction lists
+ private HashMap actionBatches = new HashMap();
+
+ public InsertActionSorter() {
+ //optimize the hash size to eliminate a rehash.
+ entityBatchNumber = new HashMap( insertions.size() + 1, 1.0f );
+ }
+
+ /**
+ * Sort the insert actions.
+ */
+ public void sort() {
+
+ // the list of entity names that indicate the batch number
+ for ( Iterator actionItr = insertions.iterator(); actionItr.hasNext(); ) {
+ EntityInsertAction action = ( EntityInsertAction ) actionItr.next();
+ // remove the current element from insertions. It will be added back later.
+ String entityName = action.getEntityName();
+
+ // the entity associated with the current action.
+ Object currentEntity = action.getInstance();
+
+ Integer batchNumber;
+ if ( latestBatches.containsKey( entityName ) ) {
+ // There is already an existing batch for this type of entity.
+ // Check to see if the latest batch is acceptable.
+ batchNumber = findBatchNumber( action, entityName );
+ }
+ else {
+ // add an entry for this type of entity.
+ // we can be assured that all referenced entities have already
+ // been processed,
+ // so specify that this entity is with the latest batch.
+ // doing the batch number before adding the name to the list is
+ // a faster way to get an accurate number.
+
+ batchNumber = new Integer( actionBatches.size() );
+ latestBatches.put( entityName, batchNumber );
+ }
+ entityBatchNumber.put( currentEntity, batchNumber );
+ addToBatch( batchNumber, action );
+ }
+ insertions.clear();
+
+ // now rebuild the insertions list. There is a batch for each entry in the name list.
+ for ( int i = 0; i < actionBatches.size(); i++ ) {
+ List batch = ( List ) actionBatches.get( new Integer( i ) );
+ for ( Iterator batchItr = batch.iterator(); batchItr.hasNext(); ) {
+ EntityInsertAction action = ( EntityInsertAction ) batchItr.next();
+ insertions.add( action );
+ }
+ }
+ }
+
+ /**
+ * Finds an acceptable batch for this entity to be a member.
+ */
+ private Integer findBatchNumber(EntityInsertAction action,
+ String entityName) {
+ // loop through all the associated entities and make sure they have been
+ // processed before the latest
+ // batch associated with this entity type.
+
+ // the current batch number is the latest batch for this entity type.
+ Integer latestBatchNumberForType = ( Integer ) latestBatches.get( entityName );
+
+ // loop through all the associations of the current entity and make sure that they are processed
+ // before the current batch number
+ Object[] propertyValues = action.getState();
+ Type[] propertyTypes = action.getPersister().getClassMetadata()
+ .getPropertyTypes();
+
+ for ( int i = 0; i < propertyValues.length; i++ ) {
+ Object value = propertyValues[i];
+ Type type = propertyTypes[i];
+ if ( type.isEntityType() && value != null ) {
+ // find the batch number associated with the current association, if any.
+ Integer associationBatchNumber = ( Integer ) entityBatchNumber.get( value );
+ if ( associationBatchNumber != null && associationBatchNumber.compareTo( latestBatchNumberForType ) > 0 ) {
+ // create a new batch for this type. The batch number is the number of current batches.
+ latestBatchNumberForType = new Integer( actionBatches.size() );
+ latestBatches.put( entityName, latestBatchNumberForType );
+ // since this entity will now be processed in the latest possible batch,
+ // we can be assured that it will come after all other associations,
+ // there's not need to continue checking.
+ break;
+ }
+ }
+ }
+ return latestBatchNumberForType;
+ }
+
+ private void addToBatch(Integer batchNumber, EntityInsertAction action) {
+ List actions = ( List ) actionBatches.get( batchNumber );
+
+ if ( actions == null ) {
+ actions = new LinkedList();
+ actionBatches.put( batchNumber, actions );
+ }
+ actions.add( action );
+ }
+
+ }
+
+}
Deleted: core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/jdbc/JDBCContext.java 2008-02-02 07:51:59 UTC (rev 14306)
+++ core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,313 +0,0 @@
-// $Id: JDBCContext.java 10476 2006-09-08 21:00:48Z epbernard $
-package org.hibernate.jdbc;
-
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.transaction.TransactionManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.hibernate.ConnectionReleaseMode;
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.SessionException;
-import org.hibernate.Transaction;
-import org.hibernate.TransactionException;
-import org.hibernate.util.JTAHelper;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.exception.JDBCExceptionHelper;
-import org.hibernate.transaction.CacheSynchronization;
-import org.hibernate.transaction.TransactionFactory;
-
-/**
- * Acts as the mediary between "entity-mode related" sessions in terms of
- * their interaction with the JDBC data store.
- *
- * @author Steve Ebersole
- */
-public class JDBCContext implements Serializable, ConnectionManager.Callback {
-
- // TODO : make this the factory for "entity mode related" sessions;
- // also means making this the target of transaction-synch and the
- // thing that knows how to cascade things between related sessions
- //
- // At that point, perhaps this thing is a "SessionContext", and
- // ConnectionManager is a "JDBCContext"? A "SessionContext" should
- // live in the impl package...
-
- private static final Logger log = LoggerFactory.getLogger( JDBCContext.class );
-
- public static interface Context extends TransactionFactory.Context {
- /**
- * We cannot rely upon this method being called! It is only
- * called if we are using Hibernate Transaction API.
- */
- public void afterTransactionBegin(Transaction tx);
- public void beforeTransactionCompletion(Transaction tx);
- public void afterTransactionCompletion(boolean success, Transaction tx);
- public ConnectionReleaseMode getConnectionReleaseMode();
- public boolean isAutoCloseSessionEnabled();
- }
-
- private Context owner;
- private ConnectionManager connectionManager;
- private transient boolean isTransactionCallbackRegistered;
- private transient Transaction hibernateTransaction;
-
- public JDBCContext(Context owner, Connection connection, Interceptor interceptor) {
- this.owner = owner;
- this.connectionManager = new ConnectionManager(
- owner.getFactory(),
- this,
- owner.getConnectionReleaseMode(),
- connection,
- interceptor
- );
-
- final boolean registerSynchronization = owner.isAutoCloseSessionEnabled()
- || owner.isFlushBeforeCompletionEnabled()
- || owner.getConnectionReleaseMode() == ConnectionReleaseMode.AFTER_TRANSACTION;
- if ( registerSynchronization ) {
- registerSynchronizationIfPossible();
- }
- }
-
- /**
- * Private constructor used exclusively for custom serialization...
- *
- */
- private JDBCContext() {
- }
-
- // ConnectionManager.Callback implementation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- public void connectionOpened() {
- if ( owner.getFactory().getStatistics().isStatisticsEnabled() ) {
- owner.getFactory().getStatisticsImplementor().connect();
- }
- }
-
- public void connectionCleanedUp() {
- if ( !isTransactionCallbackRegistered ) {
- afterTransactionCompletion( false, null );
- // Note : success = false, because we don't know the outcome of the transaction
- }
- }
-
- public SessionFactoryImplementor getFactory() {
- return owner.getFactory();
- }
-
- public ConnectionManager getConnectionManager() {
- return connectionManager;
- }
-
- public Connection borrowConnection() {
- return connectionManager.borrowConnection();
- }
-
- public Connection connection() throws HibernateException {
- if ( owner.isClosed() ) {
- throw new SessionException( "Session is closed" );
- }
-
- return connectionManager.getConnection();
- }
-
- public boolean registerCallbackIfNecessary() {
- if ( isTransactionCallbackRegistered ) {
- return false;
- }
- else {
- isTransactionCallbackRegistered = true;
- return true;
- }
-
- }
-
- public boolean registerSynchronizationIfPossible() {
- if ( isTransactionCallbackRegistered ) {
- // we already have a callback registered; either a local
- // (org.hibernate.Transaction) transaction has accepted
- // callback responsibilities, or we have previously
- // registered a transaction synch.
- return true;
- }
- boolean localCallbacksOnly = owner.getFactory().getSettings()
- .getTransactionFactory()
- .areCallbacksLocalToHibernateTransactions();
- if ( localCallbacksOnly ) {
- // the configured transaction-factory says it only supports
- // local callback mode, so no sense attempting to register a
- // JTA Synchronization
- return false;
- }
- TransactionManager tm = owner.getFactory().getTransactionManager();
- if ( tm == null ) {
- // if there is no TM configured, we will not be able to access
- // the javax.transaction.Transaction object in order to
- // register a synch anyway.
- return false;
- }
- else {
- try {
- if ( !isTransactionInProgress() ) {
- log.trace( "TransactionFactory reported no active transaction; Synchronization not registered" );
- return false;
- }
- else {
- javax.transaction.Transaction tx = tm.getTransaction();
- if ( JTAHelper.isMarkedForRollback( tx ) ) {
- log.debug( "Transaction is marked for rollback; skipping Synchronization registration" );
- return false;
- }
- else {
- tx.registerSynchronization( new CacheSynchronization(owner, this, tx, null) );
- isTransactionCallbackRegistered = true;
- log.debug("successfully registered Synchronization");
- return true;
- }
- }
- }
- catch( HibernateException e ) {
- throw e;
- }
- catch (Exception e) {
- throw new TransactionException( "could not register synchronization with JTA TransactionManager", e );
- }
- }
- }
-
- public boolean isTransactionInProgress() {
- return owner.getFactory().getSettings().getTransactionFactory()
- .isTransactionInProgress( this, owner, hibernateTransaction );
- }
-
- public Transaction getTransaction() throws HibernateException {
- if (hibernateTransaction==null) {
- hibernateTransaction = owner.getFactory().getSettings()
- .getTransactionFactory()
- .createTransaction( this, owner );
- }
- return hibernateTransaction;
- }
-
- public void beforeTransactionCompletion(Transaction tx) {
- log.trace( "before transaction completion" );
- owner.beforeTransactionCompletion(tx);
- }
-
- /**
- * We cannot rely upon this method being called! It is only
- * called if we are using Hibernate Transaction API.
- */
- public void afterTransactionBegin(Transaction tx) {
- log.trace( "after transaction begin" );
- owner.afterTransactionBegin(tx);
- }
-
- public void afterTransactionCompletion(boolean success, Transaction tx) {
- log.trace( "after transaction completion" );
-
- if ( getFactory().getStatistics().isStatisticsEnabled() ) {
- getFactory().getStatisticsImplementor().endTransaction(success);
- }
-
- connectionManager.afterTransaction();
-
- isTransactionCallbackRegistered = false;
- hibernateTransaction = null;
- owner.afterTransactionCompletion(success, tx);
- }
-
- /**
- * Called after executing a query outside the scope of
- * a Hibernate or JTA transaction
- */
- public void afterNontransactionalQuery(boolean success) {
- log.trace( "after autocommit" );
- try {
- // check to see if the connection is in auto-commit
- // mode (no connection means aggressive connection
- // release outside a JTA transaction context, so MUST
- // be autocommit mode)
- boolean isAutocommit = connectionManager.isAutoCommit();
-
- connectionManager.afterTransaction();
-
- if ( isAutocommit ) {
- owner.afterTransactionCompletion(success, null);
- }
- }
- catch (SQLException sqle) {
- throw JDBCExceptionHelper.convert(
- owner.getFactory().getSQLExceptionConverter(),
- sqle,
- "could not inspect JDBC autocommit mode"
- );
- }
- }
-
-
- // serialization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- private void writeObject(ObjectOutputStream oos) throws IOException {
- // isTransactionCallbackRegistered denotes whether any Hibernate
- // Transaction has registered as a callback against this
- // JDBCContext; only one such callback is allowed. Directly
- // serializing this value causes problems with JDBCTransaction,
- // or really any Transaction impl where the callback is local
- // to the Transaction instance itself, since that Transaction
- // is not serialized along with the JDBCContext. Thus we
- // handle that fact here explicitly...
- oos.defaultWriteObject();
- boolean deserHasCallbackRegistered = isTransactionCallbackRegistered
- && ! owner.getFactory().getSettings().getTransactionFactory()
- .areCallbacksLocalToHibernateTransactions();
- oos.writeBoolean( deserHasCallbackRegistered );
- }
-
- private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
- ois.defaultReadObject();
- isTransactionCallbackRegistered = ois.readBoolean();
- }
-
- /**
- * Custom serialization routine used during serialization of a
- * Session/PersistenceContext for increased performance.
- *
- * @param oos The stream to which we should write the serial data.
- * @throws IOException
- */
- public void serialize(ObjectOutputStream oos) throws IOException {
- connectionManager.serialize( oos );
- }
-
- /**
- * Custom deserialization routine used during deserialization of a
- * Session/PersistenceContext for increased performance.
- *
- * @param ois The stream from which to read the entry.
- * @throws IOException
- */
- public static JDBCContext deserialize(
- ObjectInputStream ois,
- Context context,
- Interceptor interceptor) throws IOException {
- JDBCContext jdbcContext = new JDBCContext();
- jdbcContext.owner = context;
- jdbcContext.connectionManager = ConnectionManager.deserialize(
- ois,
- context.getFactory(),
- interceptor,
- context.getConnectionReleaseMode(),
- jdbcContext
- );
- return jdbcContext;
- }
-}
Copied: core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java (from rev 14314, core/trunk/core/src/main/java/org/hibernate/jdbc/JDBCContext.java)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/core/src/main/java/org/hibernate/jdbc/JDBCContext.java 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,317 @@
+// $Id: JDBCContext.java 10476 2006-09-08 21:00:48Z epbernard $
+package org.hibernate.jdbc;
+
+import java.io.Serializable;
+import java.io.ObjectOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.transaction.TransactionManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.SessionException;
+import org.hibernate.Transaction;
+import org.hibernate.TransactionException;
+import org.hibernate.util.JTAHelper;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.exception.JDBCExceptionHelper;
+import org.hibernate.transaction.CacheSynchronization;
+import org.hibernate.transaction.TransactionFactory;
+
+/**
+ * Acts as the mediary between "entity-mode related" sessions in terms of
+ * their interaction with the JDBC data store.
+ *
+ * @author Steve Ebersole
+ */
+public class JDBCContext implements Serializable, ConnectionManager.Callback {
+
+ // TODO : make this the factory for "entity mode related" sessions;
+ // also means making this the target of transaction-synch and the
+ // thing that knows how to cascade things between related sessions
+ //
+ // At that point, perhaps this thing is a "SessionContext", and
+ // ConnectionManager is a "JDBCContext"? A "SessionContext" should
+ // live in the impl package...
+
+ private static final Logger log = LoggerFactory.getLogger( JDBCContext.class );
+
+ public static interface Context extends TransactionFactory.Context {
+ /**
+ * We cannot rely upon this method being called! It is only
+ * called if we are using Hibernate Transaction API.
+ */
+ public void afterTransactionBegin(Transaction tx);
+ public void beforeTransactionCompletion(Transaction tx);
+ public void afterTransactionCompletion(boolean success, Transaction tx);
+ public ConnectionReleaseMode getConnectionReleaseMode();
+ public boolean isAutoCloseSessionEnabled();
+ }
+
+ private Context owner;
+ private ConnectionManager connectionManager;
+ private transient boolean isTransactionCallbackRegistered;
+ private transient Transaction hibernateTransaction;
+
+ public JDBCContext(Context owner, Connection connection, Interceptor interceptor) {
+ this.owner = owner;
+ this.connectionManager = new ConnectionManager(
+ owner.getFactory(),
+ this,
+ owner.getConnectionReleaseMode(),
+ connection,
+ interceptor
+ );
+
+ final boolean registerSynchronization = owner.isAutoCloseSessionEnabled()
+ || owner.isFlushBeforeCompletionEnabled()
+ || owner.getConnectionReleaseMode() == ConnectionReleaseMode.AFTER_TRANSACTION;
+ if ( registerSynchronization ) {
+ registerSynchronizationIfPossible();
+ }
+ }
+
+ /**
+ * Private constructor used exclusively for custom serialization...
+ *
+ */
+ private JDBCContext() {
+ }
+
+ // ConnectionManager.Callback implementation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ public void connectionOpened() {
+ if ( owner.getFactory().getStatistics().isStatisticsEnabled() ) {
+ owner.getFactory().getStatisticsImplementor().connect();
+ }
+ }
+
+ public void connectionCleanedUp() {
+ if ( !isTransactionCallbackRegistered ) {
+ afterTransactionCompletion( false, null );
+ // Note : success = false, because we don't know the outcome of the transaction
+ }
+ }
+
+ public SessionFactoryImplementor getFactory() {
+ return owner.getFactory();
+ }
+
+ public ConnectionManager getConnectionManager() {
+ return connectionManager;
+ }
+
+ public Connection borrowConnection() {
+ return connectionManager.borrowConnection();
+ }
+
+ public Connection connection() throws HibernateException {
+ if ( owner.isClosed() ) {
+ throw new SessionException( "Session is closed" );
+ }
+
+ return connectionManager.getConnection();
+ }
+
+ public boolean registerCallbackIfNecessary() {
+ if ( isTransactionCallbackRegistered ) {
+ return false;
+ }
+ else {
+ isTransactionCallbackRegistered = true;
+ return true;
+ }
+
+ }
+
+ public boolean registerSynchronizationIfPossible() {
+ if ( isTransactionCallbackRegistered ) {
+ // we already have a callback registered; either a local
+ // (org.hibernate.Transaction) transaction has accepted
+ // callback responsibilities, or we have previously
+ // registered a transaction synch.
+ return true;
+ }
+ boolean localCallbacksOnly = owner.getFactory().getSettings()
+ .getTransactionFactory()
+ .areCallbacksLocalToHibernateTransactions();
+ if ( localCallbacksOnly ) {
+ // the configured transaction-factory says it only supports
+ // local callback mode, so no sense attempting to register a
+ // JTA Synchronization
+ return false;
+ }
+ TransactionManager tm = owner.getFactory().getTransactionManager();
+ if ( tm == null ) {
+ // if there is no TM configured, we will not be able to access
+ // the javax.transaction.Transaction object in order to
+ // register a synch anyway.
+ return false;
+ }
+ else {
+ try {
+ if ( !isTransactionInProgress() ) {
+ log.trace( "TransactionFactory reported no active transaction; Synchronization not registered" );
+ return false;
+ }
+ else {
+ javax.transaction.Transaction tx = tm.getTransaction();
+ if ( JTAHelper.isMarkedForRollback( tx ) ) {
+ // transactions marked for rollback-only cause some TM impls to throw exceptions
+ log.debug( "Transaction is marked for rollback; skipping Synchronization registration" );
+ return false;
+ }
+ else {
+ if ( hibernateTransaction == null ) {
+ hibernateTransaction = owner.getFactory().getSettings().getTransactionFactory().createTransaction( this, owner );
+ }
+ tx.registerSynchronization( new CacheSynchronization(owner, this, tx, hibernateTransaction) );
+ isTransactionCallbackRegistered = true;
+ log.debug("successfully registered Synchronization");
+ return true;
+ }
+ }
+ }
+ catch( HibernateException e ) {
+ throw e;
+ }
+ catch (Exception e) {
+ throw new TransactionException( "could not register synchronization with JTA TransactionManager", e );
+ }
+ }
+ }
+
+ public boolean isTransactionInProgress() {
+ return owner.getFactory().getSettings().getTransactionFactory()
+ .isTransactionInProgress( this, owner, hibernateTransaction );
+ }
+
+ public Transaction getTransaction() throws HibernateException {
+ if (hibernateTransaction==null) {
+ hibernateTransaction = owner.getFactory().getSettings()
+ .getTransactionFactory()
+ .createTransaction( this, owner );
+ }
+ return hibernateTransaction;
+ }
+
+ public void beforeTransactionCompletion(Transaction tx) {
+ log.trace( "before transaction completion" );
+ owner.beforeTransactionCompletion(tx);
+ }
+
+ /**
+ * We cannot rely upon this method being called! It is only
+ * called if we are using Hibernate Transaction API.
+ */
+ public void afterTransactionBegin(Transaction tx) {
+ log.trace( "after transaction begin" );
+ owner.afterTransactionBegin(tx);
+ }
+
+ public void afterTransactionCompletion(boolean success, Transaction tx) {
+ log.trace( "after transaction completion" );
+
+ if ( getFactory().getStatistics().isStatisticsEnabled() ) {
+ getFactory().getStatisticsImplementor().endTransaction(success);
+ }
+
+ connectionManager.afterTransaction();
+
+ isTransactionCallbackRegistered = false;
+ hibernateTransaction = null;
+ owner.afterTransactionCompletion(success, tx);
+ }
+
+ /**
+ * Called after executing a query outside the scope of
+ * a Hibernate or JTA transaction
+ */
+ public void afterNontransactionalQuery(boolean success) {
+ log.trace( "after autocommit" );
+ try {
+ // check to see if the connection is in auto-commit
+ // mode (no connection means aggressive connection
+ // release outside a JTA transaction context, so MUST
+ // be autocommit mode)
+ boolean isAutocommit = connectionManager.isAutoCommit();
+
+ connectionManager.afterTransaction();
+
+ if ( isAutocommit ) {
+ owner.afterTransactionCompletion(success, null);
+ }
+ }
+ catch (SQLException sqle) {
+ throw JDBCExceptionHelper.convert(
+ owner.getFactory().getSQLExceptionConverter(),
+ sqle,
+ "could not inspect JDBC autocommit mode"
+ );
+ }
+ }
+
+
+ // serialization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ private void writeObject(ObjectOutputStream oos) throws IOException {
+ // isTransactionCallbackRegistered denotes whether any Hibernate
+ // Transaction has registered as a callback against this
+ // JDBCContext; only one such callback is allowed. Directly
+ // serializing this value causes problems with JDBCTransaction,
+ // or really any Transaction impl where the callback is local
+ // to the Transaction instance itself, since that Transaction
+ // is not serialized along with the JDBCContext. Thus we
+ // handle that fact here explicitly...
+ oos.defaultWriteObject();
+ boolean deserHasCallbackRegistered = isTransactionCallbackRegistered
+ && ! owner.getFactory().getSettings().getTransactionFactory()
+ .areCallbacksLocalToHibernateTransactions();
+ oos.writeBoolean( deserHasCallbackRegistered );
+ }
+
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ois.defaultReadObject();
+ isTransactionCallbackRegistered = ois.readBoolean();
+ }
+
+ /**
+ * Custom serialization routine used during serialization of a
+ * Session/PersistenceContext for increased performance.
+ *
+ * @param oos The stream to which we should write the serial data.
+ * @throws IOException
+ */
+ public void serialize(ObjectOutputStream oos) throws IOException {
+ connectionManager.serialize( oos );
+ }
+
+ /**
+ * Custom deserialization routine used during deserialization of a
+ * Session/PersistenceContext for increased performance.
+ *
+ * @param ois The stream from which to read the entry.
+ * @throws IOException
+ */
+ public static JDBCContext deserialize(
+ ObjectInputStream ois,
+ Context context,
+ Interceptor interceptor) throws IOException {
+ JDBCContext jdbcContext = new JDBCContext();
+ jdbcContext.owner = context;
+ jdbcContext.connectionManager = ConnectionManager.deserialize(
+ ois,
+ context.getFactory(),
+ interceptor,
+ context.getConnectionReleaseMode(),
+ jdbcContext
+ );
+ return jdbcContext;
+ }
+}
Deleted: core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,86 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
-
- <name>Hibernate Manual</name>
- <description>The Hibernate reference manual</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName>
- <masterTranslation>en-US</masterTranslation>
- <translations>
- <translation>es-ES</translation>
- <translation>fr-FR</translation>
- <translation>ja-JP</translation>
- <translation>ko-KR</translation>
- <translation>pt-BR</translation>
- <translation>zh-CN</translation>
- </translations>
- <imageResource>
- <directory>src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>true</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml (from rev 14336, core/trunk/documentation/manual/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/documentation/manual/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,99 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-manual</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
+ <name>Hibernate Manual</name>
+ <description>The Hibernate reference manual</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <!--
+ here we are attaching the translate goal so that the translations are processed
+ before compilation so that the transated XML is also transformed during
+ generation
+ -->
+ <phase>process-resources</phase>
+ <goals>
+ <goal>translate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <translations>
+ <translation>es-ES</translation>
+ <translation>fr-FR</translation>
+ <translation>ja-JP</translation>
+ <translation>ko-KR</translation>
+ <translation>pt-BR</translation>
+ <translation>zh-CN</translation>
+ </translations>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>true</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,31 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <!-- todo : this module should eventually make its way over to documentation/tutorial -->
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-eg</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Example</name>
- <description>A simple example of Hibernate functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml (from rev 14419, core/trunk/eg/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/eg/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,35 @@
+<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>
+
+ <!-- todo : this module should eventually make its way over to documentation/tutorial -->
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-eg</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Example</name>
+ <description>A simple example of Hibernate functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,40 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jmx</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX capabilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml (from rev 14419, core/trunk/jmx/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/jmx/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,44 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jmx</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JMX Module</name>
+ <description>Defines Hibernate JMX capabilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/pom.xml
===================================================================
--- core/trunk/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,80 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <packaging>pom</packaging>
- <version>3.3.0-SNAPSHOT</version>
-
- <name>Hibernate Core Aggregator</name>
- <description>Aggregator of the Hibernate Core modules.</description>
- <url>http://hibernate.org</url>
-
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
- </scm>
-
- <modules>
- <module>core</module>
- <module>cache-ehcache</module>
- <module>cache-jbosscache</module>
- <module>cache-jbosscache2</module>
- <module>cache-oscache</module>
- <module>cache-swarmcache</module>
- <module>connection-c3p0</module>
- <module>connection-proxool</module>
- <module>jmx</module>
- <module>testing</module>
- <module>testsuite</module>
- <module>eg</module>
-<!-- Need to scope bytecode providers first
- <module>bytecode-cglib</module>
- <module>bytecode-javassist</module>
--->
- <module>documentation</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-6</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>deploy</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/pom.xml (from rev 14419, core/trunk/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,105 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <packaging>pom</packaging>
+ <version>3.3.0.Alpha1</version>
+
+ <name>Hibernate Core Aggregator</name>
+ <description>Aggregator of the Hibernate Core modules.</description>
+ <url>http://hibernate.org</url>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.Alpha1</url>
+ </scm>
+
+ <modules>
+ <module>core</module>
+ <module>cache-ehcache</module>
+ <module>cache-jbosscache</module>
+ <module>cache-jbosscache2</module>
+ <module>cache-oscache</module>
+ <module>cache-swarmcache</module>
+ <module>connection-c3p0</module>
+ <module>connection-proxool</module>
+ <module>jmx</module>
+ <module>testing</module>
+ <module>testsuite</module>
+ <module>eg</module>
+<!-- Need to scope bytecode providers first
+ <module>bytecode-cglib</module>
+ <module>bytecode-javassist</module>
+-->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
+ A profile used implicitly by the release plugin. Here we use it to enable documentation building
+ as well as execution of the assembly plugin (to build the SourceForge dist).
+ -->
+ <id>release</id>
+<!--
+ temporarily disable documentation module
+ <modules>
+ <module>documentation</module>
+ </modules>
+-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/hibernate-all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- seperate profile for documentation activation -->
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>documentation</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml
===================================================================
--- core/trunk/src/assembly/dist.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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
- -->
-<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
-
- <!--
- Produces a dist-style bundle similar to what previous (non-mavenized) versions of
- Hibernate did.
- -->
-
- <id>dist</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
- <includeSiteDirectory>true</includeSiteDirectory>
-
- <files>
- <file>
- <source>lgpl.txt</source>
- </file>
- <file>
- <!-- todo : bundle only current changelog? that's supportable as a generated artifact... -->
- <!-- maven-changelog-plugin may already support this (^^) ... -->
- <source>changelog.txt</source>
- </file>
- </files>
-
- <fileSets>
- <fileSet>
- <outputDirectory>sources</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- <!-- ugh! -->
- <fileSet>
- <directory>documentation/manual/en-US/target/docbook</directory>
- <outputDirectory>manual/en-US</outputDirectory>
- <includes>
- <include>**/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>documentation/manual/fr-FR/target/docbook</directory>
- <outputDirectory>manual/fr-FR</outputDirectory>
- <includes>
- <include>**/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <moduleSets>
- <!-- Handle the "code" related modules -->
- <moduleSet>
- <!-- this setting makes sure that sub modules of documentation are not picked up here -->
- <includeSubModules>false</includeSubModules>
- <includes>
- <include>org.hibernate:*</include>
- </includes>
- <excludes>
- <!-- documentation handled in separate moduleSet -->
- <exclude>org.hibernate:hibernate-documentation</exclude>
- <!-- not included in the dist bundle -->
- <exclude>org.hibernate:hibernate-testsuite</exclude>
- <!-- not included in the dist bundle (for now; eventually will become part of documentation/tutorial) -->
- <exclude>org.hibernate:hibernate-eg</exclude>
- </excludes>
- <binaries>
- <unpack>false</unpack>
- <includeDependencies>false</includeDependencies>
- <!-- drop version from JAR file name -->
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:jar:*</include>
- </includes>
- <excludes>
- <exclude>org.hibernate:*</exclude>
- <exclude>*:sources</exclude>
- <exclude>*:javadoc</exclude>
- <!-- stuff jbosscache's pom pulls in -->
- <exclude>c3p0:c3p0:jar:0.9.0.4</exclude>
- <exclude>commons-logging:commons-logging:jar:1.1</exclude>
- <exclude>findbugs:annotations:*</exclude>
- <exclude>apache-httpclient:commons-httpclient:*</exclude>
- <exclude>apache-slide:*</exclude>
- <exclude>jdbm:jdbm:*</exclude>
- <exclude>org.beanshell:bsh:*</exclude>
- <exclude>sleepycat:je:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
Copied: core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml (from rev 14336, core/trunk/src/assembly/dist.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/src/assembly/dist.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Hibernate, Relational Persistence for Idiomatic Java
+ ~
+ ~ Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ ~ indicated by the @author tags or express copyright attribution
+ ~ statements applied by the authors. All third-party contributions are
+ ~ distributed under license by Red Hat Middleware LLC.
+ ~
+ ~ 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, as published by the Free Software Foundation.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY 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
+ ~ along with this distribution; if not, write to:
+ ~ Free Software Foundation, Inc.
+ ~ 51 Franklin Street, Fifth Floor
+ ~ Boston, MA 02110-1301 USA
+ -->
+<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <!--
+ Produces a dist-style bundle similar to what previous (non-mavenized) versions of
+ Hibernate did.
+ -->
+
+ <id>dist</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <includeSiteDirectory>true</includeSiteDirectory>
+
+ <files>
+ <file>
+ <source>lgpl.txt</source>
+ </file>
+ <file>
+ <!-- todo : bundle only current changelog? that's supportable as a generated artifact... -->
+ <!-- maven-changelog-plugin may already support this (^^) ... -->
+ <source>changelog.txt</source>
+ </file>
+ <file>
+ <source>target/${project.artifactId}-${project.version}-all.jar</source>
+ <destName>hibernate3.jar</destName>
+ </file>
+ </files>
+
+ <fileSets>
+ <fileSet>
+ <outputDirectory>sources</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ <!-- ugh! -->
+ <fileSet>
+ <directory>documentation/manual/en-US/target/docbook</directory>
+ <outputDirectory>manual/en-US</outputDirectory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>documentation/manual/fr-FR/target/docbook</directory>
+ <outputDirectory>manual/fr-FR</outputDirectory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <moduleSets>
+ <!-- Handle the "code" related modules -->
+ <moduleSet>
+ <!-- this setting makes sure that sub modules of documentation are not picked up here -->
+ <includeSubModules>false</includeSubModules>
+ <includes>
+ <include>org.hibernate:*</include>
+ </includes>
+ <excludes>
+ <!-- documentation handled in separate moduleSet -->
+ <exclude>org.hibernate:hibernate-documentation</exclude>
+ <!-- not included in the dist bundle -->
+ <exclude>org.hibernate:hibernate-testsuite</exclude>
+ <!-- not included in the dist bundle (for now; eventually will become part of documentation/tutorial) -->
+ <exclude>org.hibernate:hibernate-eg</exclude>
+ </excludes>
+ <binaries>
+ <unpack>false</unpack>
+ <includeDependencies>false</includeDependencies>
+ <!-- drop version from JAR file name -->
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:jar:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.hibernate:*</exclude>
+ <exclude>*:sources</exclude>
+ <exclude>*:javadoc</exclude>
+ <!-- stuff jbosscache's pom pulls in -->
+ <exclude>c3p0:c3p0:jar:0.9.0.4</exclude>
+ <exclude>commons-logging:commons-logging:jar:1.1</exclude>
+ <exclude>findbugs:annotations:*</exclude>
+ <exclude>apache-httpclient:commons-httpclient:*</exclude>
+ <exclude>apache-slide:*</exclude>
+ <exclude>jdbm:jdbm:*</exclude>
+ <exclude>org.beanshell:bsh:*</exclude>
+ <exclude>sleepycat:je:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+</assembly>
\ No newline at end of file
Copied: core/tags/hibernate-3.3.0.Alpha1/src/assembly/hibernate-all.xml (from rev 14336, core/trunk/src/assembly/hibernate-all.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/src/assembly/hibernate-all.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/src/assembly/hibernate-all.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Hibernate, Relational Persistence for Idiomatic Java
+ ~
+ ~ Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ ~ indicated by the @author tags or express copyright attribution
+ ~ statements applied by the authors. All third-party contributions are
+ ~ distributed under license by Red Hat Middleware LLC.
+ ~
+ ~ 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, as published by the Free Software Foundation.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY 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
+ ~ along with this distribution; if not, write to:
+ ~ Free Software Foundation, Inc.
+ ~ 51 Franklin Street, Fifth Floor
+ ~ Boston, MA 02110-1301 USA
+ -->
+<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <!--
+ Produces a dist-style bundle similar to what previous (non-mavenized) versions of
+ Hibernate did.
+ -->
+ <id>all</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>hibernate-all</baseDirectory>
+ <moduleSets>
+ <!-- Handle the "code" related modules -->
+ <moduleSet>
+ <!-- this setting makes sure that sub modules of documentation are not picked up here -->
+ <includeSubModules>false</includeSubModules>
+ <includes>
+ <include>org.hibernate:*</include>
+ </includes>
+ <excludes>
+ <!-- documentation handled in separate moduleSet -->
+ <exclude>org.hibernate:hibernate-documentation</exclude>
+ <!-- not included in the dist bundle -->
+ <exclude>org.hibernate:hibernate-testsuite</exclude>
+ <!-- not included in the dist bundle (for now; eventually will become part of documentation/tutorial) -->
+ <exclude>org.hibernate:hibernate-eg</exclude>
+ </excludes>
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt
===================================================================
--- core/trunk/src/site/apt/index.apt 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,51 +0,0 @@
- ------
- Introduction
- ------
- Steve Ebersole
- ------
- 20 July 2007
- ------
-
-~~ Copyright © 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 Core - Relational Persistence for Idiomatic Java
-
- Hibernate is a powerful, high performance object/relational persistence and query
- service. Hibernate lets you develop persistent classes following common object-oriented
- idioms such as association, inheritance, polymorphism, composition, and collections.
-
- Hibernate's goal is to relieve the developer from 95 percent of common data persistence related
- programming tasks, compared to manual coding with SQL and the JDBC API. Hibernate Core for Java
- generates SQL for you, relieves you from manual JDBC result set handling and object conversion,
- and keeps your application portable to all SQL databases. However, unlike many other persistence
- solutions, Hibernate does not hide the power of SQL from you and guarantees that your investment
- in relational technology and knowledge is as valid as always.
-
- Hibernate provides transparent persistence, the only requirement for a persistent class is a
- no-argument constructor. You don't even need classes, you can also persist a model using Maps of
- Maps, or just about anything else.
-
- Hibernate offers sophisticated query options. You can write plain SQL, object-oriented
- HQL (Hibernate Query Language), or create programatic Criteria and Example queries. Hibernate can
- optimize object loading all the time, with various fetching and caching options.
-
- Hibernate adapts to your development process, no matter if you start with a design from scratch or
- work with an existing database, and it will support any application architecture. Combined with
- Hibernate EntityManager and Hibernate Annotations you can use Hibernate as a certified Java Persistence
- provider.
-
- Please visit the {{{http://hibernate.org}website}} for more information.
-
- Happpy Hibernating!
Copied: core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt (from rev 14340, core/trunk/src/site/apt/index.apt)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/src/site/apt/index.apt 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,59 @@
+ ------
+ Introduction
+ ------
+ Steve Ebersole
+ ------
+ 20 July 2007
+ ------ß
+
+~~ Hibernate, Relational Persistence for Idiomatic Java
+~~
+~~ Copyright (c) $today.year, Red Hat Middleware LLC or third-party contributors as
+~~ indicated by the @author tags or express copyright attribution
+~~ statements applied by the authors. All third-party contributions are
+~~ distributed under license by Red Hat Middleware LLC.
+~~
+~~ 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, as published by the Free Software Foundation.
+~~
+~~ This program is distributed in the hope that it will be useful,
+~~ but WITHOUT ANY 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
+~~ along with this distribution; if not, write to:
+~~ Free Software Foundation, Inc.
+~~ 51 Franklin Street, Fifth Floor
+~~ Boston, MA 02110-1301 USA
+
+Hibernate Core - Relational Persistence for Idiomatic Java
+
+ Hibernate is a powerful, high performance object/relational persistence and query
+ service. Hibernate lets you develop persistent classes following common object-oriented
+ idioms such as association, inheritance, polymorphism, composition, and collections.
+
+ Hibernate's goal is to relieve the developer from 95 percent of common data persistence related
+ programming tasks, compared to manual coding with SQL and the JDBC API. Hibernate Core for Java
+ generates SQL for you, relieves you from manual JDBC result set handling and object conversion,
+ and keeps your application portable to all SQL databases. However, unlike many other persistence
+ solutions, Hibernate does not hide the power of SQL from you and guarantees that your investment
+ in relational technology and knowledge is as valid as always.
+
+ Hibernate provides transparent persistence, the only requirement for a persistent class is a
+ no-argument constructor. You don't even need classes, you can also persist a model using Maps of
+ Maps, or just about anything else.
+
+ Hibernate offers sophisticated query options. You can write plain SQL, object-oriented
+ HQL (Hibernate Query Language), or create programatic Criteria and Example queries. Hibernate can
+ optimize object loading all the time, with various fetching and caching options.
+
+ Hibernate adapts to your development process, no matter if you start with a design from scratch or
+ work with an existing database, and it will support any application architecture. Combined with
+ Hibernate EntityManager and Hibernate Annotations you can use Hibernate as a certified Java Persistence
+ provider.
+
+ Please visit the {{{http://hibernate.org}website}} for more information.
+
+ Happpy Hibernating!
Deleted: core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml
===================================================================
--- core/trunk/src/site/site.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,35 +0,0 @@
-<project name="Hibernate Core">
-
- <bannerLeft>
- <name>Hibernate Core Project</name>
- <src>images/hibernate_logo.png</src>
- <href>http://hibernate.org</href>
- </bannerLeft>
-
- <version position="left"/>
- <publishDate position="navigation-bottom" format="yyyy-MM-dd"/>
-
- <poweredBy>
- <logo name="Maven" href="http://maven.apache.org/" img="images/maven-button-4.png"/>
- </poweredBy>
-
- <body>
- <head>
- <link rel="shortcut icon" href="images/favicon.ico"/>
- </head>
-
- <links>
- <item name="Hibernate" href="http://hibernate.org"/>
- <item name="JBoss" href="http://jboss.org"/>
- <item name="Red Hat" href="http://redhat.com"/>
- </links>
-
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- </menu>
-
- <menu ref="reports"/>
- </body>
-</project>
-
-
\ No newline at end of file
Copied: core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml (from rev 14336, core/trunk/src/site/site.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/src/site/site.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,63 @@
+<project name="Hibernate Core">
+
+ <bannerLeft>
+ <name>Hibernate Core Project</name>
+ <src>images/hibernate_logo.png</src>
+ <href>http://hibernate.org</href>
+ </bannerLeft>
+
+ <version position="left"/>
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd"/>
+
+ <poweredBy>
+ <logo name="Maven" href="http://maven.apache.org/" img="images/maven-button-4.png"/>
+ </poweredBy>
+
+ <body>
+
+ <head>
+ <link rel="shortcut icon" href="images/favicon.ico"/>
+ </head>
+
+ <links>
+ <item name="Hibernate" href="http://hibernate.org"/>
+ <item name="JBoss" href="http://jboss.org"/>
+ <item name="Red Hat" href="http://redhat.com"/>
+ </links>
+
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Getting Started" href="quickstart.html"/>
+ <item name="Documentation" href="documentation.html"/>
+ <item name="FAQs" href="faq.html"/>
+ </menu>
+
+ <menu name="Information">
+ <item name="Project Summary" href="project-summary.html"/>
+ <item name="Project License" href="license.html"/>
+ <item name="Issue Tracking" href="issue-tracking.html"/>
+ <item name="Mailing Lists" href="mail-lists.html"/>
+ <item name="Source Repository" href="source-repository.html"/>
+ <item name="Continuous Integration" href="integration.html"/>
+ <item name="Dependencies" href="dependencies.html"/>
+ <item name="Dependency Convergence" href="dependency-convergence.html"/>
+ </menu>
+
+ <menu name="Modules">
+ <item name="Core" href="modules/core/index.html"/>
+ <item name="JMX Capabilities" href="modules/jmx/index.html"/>
+ <item name="Ehcache Integration" href="ehcache/index.html"/>
+ <item name="JBossCache(1.x) Integration" href="jbc/index.html"/>
+ <item name="JBossCache(2.x) Integration" href="jbc2/index.html"/>
+ <item name="SwarmCache Integration" href="swarmcache/index.html"/>
+ <item name="OSCache Integration" href="oscache/index.html"/>
+ <item name="C3P0 Integration" href="c3p0/index.html"/>
+ <item name="Proxool Integration" href="proxool/index.html"/>
+ <item name="Testing Support" href="testing/index.html"/>
+ </menu>
+
+ </body>
+
+</project>
+
+
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,36 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testing</name>
- <description>Hibernate JUnit test utilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml (from rev 14419, core/trunk/testing/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/testing/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,52 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testing</name>
+ <description>Hibernate JUnit test utilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.hbm.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2007-12-11 01:09:52 UTC (rev 14241)
+++ core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -1,361 +0,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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testsuite</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testsuite</name>
- <description>The testsuite of Hibernate functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- </dependency>
- <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <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>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass/>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass/>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>pgsql8</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2-8</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hiber</jdbc.user>
- <jdbc.pass>hiber</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The Sybase 12 test envionment -->
- <profile>
- <id>sybase12</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (jTDS) test envionment -->
- <profile>
- <id>sqlserver-jtds</id>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>sqlserver-msjdbc</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
-
-</project>
Copied: core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml (from rev 14419, core/trunk/testsuite/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.Alpha1/testsuite/pom.xml 2008-03-11 01:59:19 UTC (rev 14420)
@@ -0,0 +1,365 @@
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testsuite</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testsuite</name>
+ <description>The testsuite of Hibernate functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <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>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-test-ext-plugin</artifactId>
+ <version>1.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extend</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <!-- HSQLDB is the default (eventually move to H2) -->
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
+ <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
+ <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass />
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The H2 test envionment -->
+ <profile>
+ <id>h2</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.h2database</groupId>
+ <artifactId>h2database</artifactId>
+ <version>1.0.20061217</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
+ <jdbc.driver>org.h2.Driver</jdbc.driver>
+ <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass />
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Profiles naming db instances in the Red Hat QA/QE lab
+
+ First, those with OSS drivers
+ ###################################################################
+ -->
+
+ <!-- The MySQL5 test envionment -->
+ <profile>
+ <id>mysql5</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+ <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The PostgreSQL test envionment -->
+ <profile>
+ <id>pgsql8</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <classifier>jdbc3</classifier>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+ <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+ <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Then, those with commercial drivers
+ ###################################################################
+ -->
+
+ <!-- The Oracle9i test envionment -->
+ <profile>
+ <id>oracle9i</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The Oracle10g test envionment -->
+ <profile>
+ <id>oracle10g</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The DB2 8.x test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2-8</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+ <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+ <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hiber</jdbc.user>
+ <jdbc.pass>hiber</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The Sybase 12 test envionment -->
+ <profile>
+ <id>sybase12</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
+ <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+ <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (jTDS) test envionment -->
+ <profile>
+ <id>sqlserver-jtds</id>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (MS JDBC) test envionment -->
+ <profile>
+ <id>sqlserver-msjdbc</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+ <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation>4096</jdbc.isolation>
+ </properties>
+ </profile>
+
+ </profiles>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
16 years, 9 months
- 1
- 0
Hibernate SVN: r14419 - in core/trunk: cache-ehcache and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-03-10 21:59:09 -0400 (Mon, 10 Mar 2008)
New Revision: 14419
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-jbosscache2/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/eg/pom.xml
core/trunk/jmx/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
Log:
[maven-release-plugin] prepare release hibernate-3.3.0.Alpha1
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/cache-ehcache/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,97 +1,101 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Ehcache Integration</name>
- <description>Integration of Hibernate with Ehcache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Ehcache Integration</name>
+ <description>Integration of Hibernate with Ehcache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/cache-jbosscache/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,128 +1,132 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.GA</version>
- </dependency>
- <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-minimal</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2se</artifactId>
- <version>200504122039</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.7</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <version>1.4.1.GA</version>
+ </dependency>
+ <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-minimal</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>200504122039</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <version>2.2.7</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/cache-jbosscache2/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,156 +1,154 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache2</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache2.x Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>2.1.0.CR4</version>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache2</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache2.x Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
- <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.1</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core :( and needed for testing -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>2.1.0.CR4</version>
+ </dependency>
+ <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core :( and needed for testing -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
<excludes>
<!-- Skip a long-running test of a prototype class -->
<exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- <property>
- <name>jgroups.bind_addr</name>
- <value>${jgroups.bind_addr}</value>
- </property>
- <!-- There are problems with multicast and IPv6 on some
- OS/JDK combos, so we tell Java to use IPv4. If you
- have problems with multicast when running the tests
- you can try setting this to 'false', although typically
- that won't be helpful.
- -->
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
</property>
+ <property>
+ <name>jgroups.bind_addr</name>
+ <value>${jgroups.bind_addr}</value>
+ </property>
+ <!-- There are problems with multicast and IPv6 on some
+ OS/JDK combos, so we tell Java to use IPv4. If you
+ have problems with multicast when running the tests
+ you can try setting this to 'false', although typically
+ that won't be helpful.
+ -->
+ <property>
+ <name>java.net.preferIPv4Stack</name>
+ <value>true</value>
+ </property>
<!-- Tell JGroups to only wait a short time for PING
responses before determining coordinator. Speeds cluster
formation during integration tests. (This is too
@@ -174,35 +172,41 @@
<property>
<name>jgroups.udp.enable_bundling</name>
<value>false</value>
- </property>
- </systemProperties>
- <skipExec>${skipUnitTests}</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <skipUnitTests>true</skipUnitTests>
- <!--
- Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
- may be problems with multicast on the interface JGroups uses by default on your machine. You can
- try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
- setting the value to an interface where you know multicast works
- -->
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </properties>
-
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <skipUnitTests>false</skipUnitTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
+ </property>
+ </systemProperties>
+ <skipExec>${skipUnitTests}</skipExec>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <skipUnitTests>true</skipUnitTests>
+ <!--
+ Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
+ may be problems with multicast on the interface JGroups uses by default on your machine. You can
+ try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
+ setting the value to an interface where you know multicast works
+ -->
+ <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <skipUnitTests>false</skipUnitTests>
+ </properties>
+ </profile>
+ </profiles>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/cache-oscache/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,34 +1,38 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate OSCache Integration</name>
- <description>Integration of Hibernate with OSCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate OSCache Integration</name>
+ <description>Integration of Hibernate with OSCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/cache-swarmcache/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,34 +1,38 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate SwarmCache Integration</name>
- <description>Integration of Hibernate with SwarmCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>swarmcache</groupId>
- <artifactId>swarmcache</artifactId>
- <version>1.0RC2</version>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate SwarmCache Integration</name>
+ <description>Integration of Hibernate with SwarmCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>swarmcache</groupId>
+ <artifactId>swarmcache</artifactId>
+ <version>1.0RC2</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/connection-c3p0/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,34 +1,38 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate C3P0 ConnectionProvider</name>
- <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate C3P0 ConnectionProvider</name>
+ <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/connection-proxool/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,34 +1,38 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-proxool</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Proxool ConnectionProvider</name>
- <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>proxool</groupId>
- <artifactId>proxool</artifactId>
- <version>0.8.3</version>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-proxool</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Proxool ConnectionProvider</name>
+ <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ <version>0.8.3</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/core/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,6 +1,4 @@
-<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">
+<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>
@@ -12,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.Alpha1</version>
<packaging>jar</packaging>
<name>Hibernate Core</name>
@@ -144,4 +142,10 @@
<antlrPluginVersion>2.1</antlrPluginVersion>
</properties>
-</project>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/eg/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,6 +1,4 @@
-<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">
+<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>
@@ -14,7 +12,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-eg</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.Alpha1</version>
<packaging>jar</packaging>
<name>Hibernate Example</name>
@@ -28,4 +26,10 @@
</dependency>
</dependencies>
-</project>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/jmx/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,40 +1,44 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jmx</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX capabilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jmx</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JMX Module</name>
+ <description>Defines Hibernate JMX capabilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,107 +1,105 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <packaging>pom</packaging>
- <version>3.3.0-SNAPSHOT</version>
-
- <name>Hibernate Core Aggregator</name>
- <description>Aggregator of the Hibernate Core modules.</description>
- <url>http://hibernate.org</url>
-
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
- </scm>
-
- <modules>
- <module>core</module>
- <module>cache-ehcache</module>
- <module>cache-jbosscache</module>
- <module>cache-jbosscache2</module>
- <module>cache-oscache</module>
- <module>cache-swarmcache</module>
- <module>connection-c3p0</module>
- <module>connection-proxool</module>
- <module>jmx</module>
- <module>testing</module>
- <module>testsuite</module>
- <module>eg</module>
-<!-- Need to scope bytecode providers first
- <module>bytecode-cglib</module>
- <module>bytecode-javassist</module>
--->
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!--
- A profile used implicitly by the release plugin. Here we use it to enable documentation building
- as well as execution of the assembly plugin (to build the SourceForge dist).
- -->
- <id>release</id>
-<!--
- temporarily disable documentation module
- <modules>
- <module>documentation</module>
- </modules>
--->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>deploy</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/hibernate-all.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- seperate profile for documentation activation -->
- <profile>
- <id>docs</id>
- <modules>
- <module>documentation</module>
- </modules>
- </profile>
- </profiles>
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <packaging>pom</packaging>
+ <version>3.3.0.Alpha1</version>
+
+ <name>Hibernate Core Aggregator</name>
+ <description>Aggregator of the Hibernate Core modules.</description>
+ <url>http://hibernate.org</url>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.Alpha1</url>
+ </scm>
+
+ <modules>
+ <module>core</module>
+ <module>cache-ehcache</module>
+ <module>cache-jbosscache</module>
+ <module>cache-jbosscache2</module>
+ <module>cache-oscache</module>
+ <module>cache-swarmcache</module>
+ <module>connection-c3p0</module>
+ <module>connection-proxool</module>
+ <module>jmx</module>
+ <module>testing</module>
+ <module>testsuite</module>
+ <module>eg</module>
+<!-- Need to scope bytecode providers first
+ <module>bytecode-cglib</module>
+ <module>bytecode-javassist</module>
+-->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
+ A profile used implicitly by the release plugin. Here we use it to enable documentation building
+ as well as execution of the assembly plugin (to build the SourceForge dist).
+ -->
+ <id>release</id>
+<!--
+ temporarily disable documentation module
+ <modules>
+ <module>documentation</module>
+ </modules>
+-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/hibernate-all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- seperate profile for documentation activation -->
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>documentation</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/testing/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,48 +1,52 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testing</name>
- <description>Hibernate JUnit test utilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.hbm.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testing</name>
+ <description>Hibernate JUnit test utilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.hbm.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2008-03-11 00:25:55 UTC (rev 14418)
+++ core/trunk/testsuite/pom.xml 2008-03-11 01:59:09 UTC (rev 14419)
@@ -1,361 +1,365 @@
-<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>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testsuite</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testsuite</name>
- <description>The testsuite of Hibernate functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- </dependency>
- <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <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>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass/>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass/>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>pgsql8</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2-8</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hiber</jdbc.user>
- <jdbc.pass>hiber</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The Sybase 12 test envionment -->
- <profile>
- <id>sybase12</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (jTDS) test envionment -->
- <profile>
- <id>sqlserver-jtds</id>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>sqlserver-msjdbc</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
-
-</project>
+<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>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testsuite</artifactId>
+ <version>3.3.0.Alpha1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testsuite</name>
+ <description>The testsuite of Hibernate functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <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>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-test-ext-plugin</artifactId>
+ <version>1.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extend</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <!-- HSQLDB is the default (eventually move to H2) -->
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
+ <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
+ <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass />
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The H2 test envionment -->
+ <profile>
+ <id>h2</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.h2database</groupId>
+ <artifactId>h2database</artifactId>
+ <version>1.0.20061217</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
+ <jdbc.driver>org.h2.Driver</jdbc.driver>
+ <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass />
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Profiles naming db instances in the Red Hat QA/QE lab
+
+ First, those with OSS drivers
+ ###################################################################
+ -->
+
+ <!-- The MySQL5 test envionment -->
+ <profile>
+ <id>mysql5</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+ <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The PostgreSQL test envionment -->
+ <profile>
+ <id>pgsql8</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <classifier>jdbc3</classifier>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+ <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+ <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Then, those with commercial drivers
+ ###################################################################
+ -->
+
+ <!-- The Oracle9i test envionment -->
+ <profile>
+ <id>oracle9i</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The Oracle10g test envionment -->
+ <profile>
+ <id>oracle10g</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <!-- use the 10g drivers which are surprisingly largely bug free -->
+ <version>10.0.2.0</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+ <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+ <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The DB2 8.x test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2-8</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>3.1.57</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+ <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+ <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hiber</jdbc.user>
+ <jdbc.pass>hiber</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The Sybase 12 test envionment -->
+ <profile>
+ <id>sybase12</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
+ <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+ <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (jTDS) test envionment -->
+ <profile>
+ <id>sqlserver-jtds</id>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (MS JDBC) test envionment -->
+ <profile>
+ <id>sqlserver-msjdbc</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+ <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation>4096</jdbc.isolation>
+ </properties>
+ </profile>
+
+ </profiles>
+
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.A...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
16 years, 9 months
- 1
- 0
Hibernate SVN: r14418 - in annotations/trunk/src: test/org/hibernate/test/annotations/idmanytoone/alphabetical and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-10 20:25:55 -0400 (Mon, 10 Mar 2008)
New Revision: 14418
Added:
annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java
annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java
annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java
Modified:
annotations/trunk/src/java/org/hibernate/cfg/ToOneFkSecondPass.java
Log:
ANN-694 incorrect circularity error when the manytoone starts with the id proeprty chars.
Modified: annotations/trunk/src/java/org/hibernate/cfg/ToOneFkSecondPass.java
===================================================================
--- annotations/trunk/src/java/org/hibernate/cfg/ToOneFkSecondPass.java 2008-03-10 23:51:06 UTC (rev 14417)
+++ annotations/trunk/src/java/org/hibernate/cfg/ToOneFkSecondPass.java 2008-03-11 00:25:55 UTC (rev 14418)
@@ -29,7 +29,7 @@
private String path;
private String entityClassName;
- ToOneFkSecondPass(
+ public ToOneFkSecondPass(
ToOne value, Ejb3JoinColumn[] columns, boolean unique, String entityClassName, String path, ExtendedMappings mappings
) {
super( value, columns );
@@ -52,7 +52,7 @@
}
else if ( property != null) {
//try explicit identifier property
- return path.startsWith( property.getName() );
+ return path.startsWith( property.getName() + "." );
}
else {
//try the embedded property
Added: annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java 2008-03-11 00:25:55 UTC (rev 14418)
@@ -0,0 +1,17 @@
+//$
+package org.hibernate.test.annotations.idmanytoone.alphabetical;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Acces implements Serializable {
+ @Id
+ private BigInteger idpk;
+
+ @ManyToOne
+ private Droitacces idpkdracc;
+}
\ No newline at end of file
Added: annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java 2008-03-11 00:25:55 UTC (rev 14418)
@@ -0,0 +1,22 @@
+//$
+package org.hibernate.test.annotations.idmanytoone.alphabetical;
+
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class AlphabeticalManyToOneTest extends TestCase {
+ public void testAlphabeticalTest() throws Exception {
+ //test through deployment
+ }
+
+ protected Class[] getMappings() {
+ return new Class[] {
+ Acces.class,
+ Droitacces.class,
+ Benefserv.class,
+ Service.class
+ };
+ }
+}
Added: annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java 2008-03-11 00:25:55 UTC (rev 14418)
@@ -0,0 +1,17 @@
+//$
+package org.hibernate.test.annotations.idmanytoone.alphabetical;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Benefserv {
+ @Id
+ private BigInteger idpk;
+
+ @ManyToOne
+ private Service idpkser;
+}
Added: annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java 2008-03-11 00:25:55 UTC (rev 14418)
@@ -0,0 +1,17 @@
+//$
+package org.hibernate.test.annotations.idmanytoone.alphabetical;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Droitacces {
+ @Id
+ private BigInteger idpk;
+
+ @ManyToOne
+ private Benefserv idpkbenef;
+}
Added: annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java 2008-03-11 00:25:55 UTC (rev 14418)
@@ -0,0 +1,14 @@
+//$
+package org.hibernate.test.annotations.idmanytoone.alphabetical;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+
+@Entity
+public class Service {
+ @Id
+ private BigInteger idpk;
+}
16 years, 9 months
- 1
- 0
Hibernate SVN: r14417 - annotations/trunk/src/java/org/hibernate/cfg/annotations.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-10 19:51:06 -0400 (Mon, 10 Mar 2008)
New Revision: 14417
Modified:
annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
Log:
ANN-701 Better error message when @CollectionId is used on wrong collection types
Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBinder.java 2008-03-10 03:26:11 UTC (rev 14416)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBinder.java 2008-03-10 23:51:06 UTC (rev 14417)
@@ -203,15 +203,31 @@
//TODO consider using an XClass
Class returnedClass = property.getCollectionClass();
if ( java.util.Set.class.equals( returnedClass ) ) {
+ if ( property.isAnnotationPresent( CollectionId.class ) ) {
+ throw new AnnotationException( "Set do not support @CollectionId: "
+ + StringHelper.qualify( entityName, property.getName() ) );
+ }
return new SetBinder();
}
else if ( java.util.SortedSet.class.equals( returnedClass ) ) {
+ if ( property.isAnnotationPresent( CollectionId.class ) ) {
+ throw new AnnotationException( "Set do not support @CollectionId: "
+ + StringHelper.qualify( entityName, property.getName() ) );
+ }
return new SetBinder( true );
}
else if ( java.util.Map.class.equals( returnedClass ) ) {
+ if ( property.isAnnotationPresent( CollectionId.class ) ) {
+ throw new AnnotationException( "Map do not support @CollectionId: "
+ + StringHelper.qualify( entityName, property.getName() ) );
+ }
return new MapBinder();
}
else if ( java.util.SortedMap.class.equals( returnedClass ) ) {
+ if ( property.isAnnotationPresent( CollectionId.class ) ) {
+ throw new AnnotationException( "Map do not support @CollectionId: "
+ + StringHelper.qualify( entityName, property.getName() ) );
+ }
return new MapBinder( true );
}
else if ( java.util.Collection.class.equals( returnedClass ) ) {
@@ -224,6 +240,10 @@
}
else if ( java.util.List.class.equals( returnedClass ) ) {
if ( isIndexed ) {
+ if ( property.isAnnotationPresent( CollectionId.class ) ) {
+ throw new AnnotationException( "List do not support @CollectionId and @IndexColumn at the same time: "
+ + StringHelper.qualify( entityName, property.getName() ) );
+ }
return new ListBinder();
}
else if ( property.isAnnotationPresent( CollectionId.class ) ) {
16 years, 9 months
- 1
- 0