Hibernate SVN: r14406 - search/trunk/src/test/org/hibernate/search/test/inheritance.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-07 01:17:03 -0500 (Fri, 07 Mar 2008)
New Revision: 14406
Added:
search/trunk/src/test/org/hibernate/search/test/inheritance/Being.java
Modified:
search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java
search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java
Log:
Better hsearch inheritance tests
Modified: search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java 2008-03-06 23:41:36 UTC (rev 14405)
+++ search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java 2008-03-07 06:17:03 UTC (rev 14406)
@@ -16,7 +16,7 @@
*/
@Entity
@Indexed
-public class Animal {
+public class Animal extends Being {
private Long id;
private String name;
Added: search/trunk/src/test/org/hibernate/search/test/inheritance/Being.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/inheritance/Being.java (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/inheritance/Being.java 2008-03-07 06:17:03 UTC (rev 14406)
@@ -0,0 +1,27 @@
+//$
+package org.hibernate.search.test.inheritance;
+
+import javax.persistence.MappedSuperclass;
+
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.FieldBridge;
+import org.hibernate.search.test.bridge.PaddedIntegerBridge;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@MappedSuperclass
+public class Being {
+ @Field(index = Index.UN_TOKENIZED)
+ @FieldBridge(impl = PaddedIntegerBridge.class)
+ private int weight;
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public void setWeight(int weight) {
+ this.weight = weight;
+ }
+}
Modified: search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2008-03-06 23:41:36 UTC (rev 14405)
+++ search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2008-03-07 06:17:03 UTC (rev 14406)
@@ -8,6 +8,9 @@
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RangeQuery;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.index.Term;
import java.util.List;
@@ -25,7 +28,8 @@
Mammal m = new Mammal();
m.setMammalNbr(2);
m.setName("Elephant Jr");
- s.save(m);
+ m.setWeight( 400 );
+ s.save(m);
tx.commit();//post commit events for lucene
s.clear();
tx = s.beginTransaction();
@@ -51,7 +55,14 @@
result = hibQuery.list();
assertNotNull( result );
assertEquals( "Query filtering on superclass return mapped subclasses", 2, result.size() );
- for (Object managedEntity : result) {
+
+ query = new RangeQuery( new Term( "weight", "00200" ), null, true);
+ hibQuery = s.createFullTextQuery( query, Animal.class );
+ result = hibQuery.list();
+ assertNotNull( result );
+ assertEquals( "Query on non @Indexed superclass property", 1, result.size() );
+
+ for (Object managedEntity : result) {
s.delete(managedEntity);
}
tx.commit();
16 years, 3 months
Hibernate SVN: r14405 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 18:41:36 -0500 (Thu, 06 Mar 2008)
New Revision: 14405
Added:
entitymanager/tags/v3_3_2_CR1/
Log:
Release HEM 3.3.2.CR1
Copied: entitymanager/tags/v3_3_2_CR1 (from rev 14404, entitymanager/trunk)
16 years, 3 months
Hibernate SVN: r14404 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 18:40:45 -0500 (Thu, 06 Mar 2008)
New Revision: 14404
Removed:
entitymanager/tags/v3_3_2_CR1/
Log:
forgot the last commit
16 years, 3 months
Hibernate SVN: r14403 - entitymanager/trunk.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 18:40:14 -0500 (Thu, 06 Mar 2008)
New Revision: 14403
Modified:
entitymanager/trunk/build.xml
entitymanager/trunk/changelog.txt
entitymanager/trunk/ivy.xml
entitymanager/trunk/readme.txt
Log:
Release
Modified: entitymanager/trunk/build.xml
===================================================================
--- entitymanager/trunk/build.xml 2008-03-06 23:26:31 UTC (rev 14402)
+++ entitymanager/trunk/build.xml 2008-03-06 23:40:14 UTC (rev 14403)
@@ -387,6 +387,11 @@
<include name="common-build.xml"/>
</fileset>
</copy>
+ <copy todir="${dist.dir}/ivy" failonerror="false">
+ <fileset dir="${ivy.jar.dir}">
+ <include name="**/*.*"/>
+ </fileset>
+ </copy>
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
@@ -402,6 +407,9 @@
<include name="*.jar"/>
</fileset>
</copy>
+ <copy todir="${dist.lib.dir}/test" failonerror="false">
+ <fileset file="${lib.dir}/test/*.jar"/>
+ </copy>
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
Modified: entitymanager/trunk/changelog.txt
===================================================================
--- entitymanager/trunk/changelog.txt 2008-03-06 23:26:31 UTC (rev 14402)
+++ entitymanager/trunk/changelog.txt 2008-03-06 23:40:14 UTC (rev 14403)
@@ -1,6 +1,18 @@
Hibernate EntityManager Changelog
==================================
+3.3.2.CR1 (06-03-2008)
+----------------------
+
+** Bug
+ * [EJB-295] - External META-INF/orm.xml not included even when explicitly requested when an internal orm.xml is already present
+ * [EJB-330] - Calling configure(String) on Ejb3Configuration before addAnnotatedClass(..) breaks callbacks
+ * [EJB-333] - Space in path result in error during deployment in JBoss AS
+ * [EJB-334] - Space in path result in error during deployment in JBoss AS
+ * [EJB-340] - onLoad() callback from Interceptor and onLoad() from Lifecycle are never invoked in an EJB3 environment
+ * [EJB-341] - Trying to create unexisting named query set the transaction to rollback
+
+
3.3.2.Beta2 (15-01-2008)
------------------------
Modified: entitymanager/trunk/ivy.xml
===================================================================
--- entitymanager/trunk/ivy.xml 2008-03-06 23:26:31 UTC (rev 14402)
+++ entitymanager/trunk/ivy.xml 2008-03-06 23:40:14 UTC (rev 14403)
@@ -12,8 +12,8 @@
<artifact name="hibernate-entitymanager" conf="core"/>
</publications>
<dependencies>
- <dependency name="jpa-api" rev="latest.integration" conf="core->default"/>
- <dependency name="commons-annotations" rev="latest.integration" conf="core->core"/>
- <dependency name="annotations" rev="latest.integration" conf="core->core"/>
+ <dependency name="jpa-api" rev="1.0.1.Beta1" conf="core->default"/>
+ <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/>
+ <dependency name="annotations" rev="3.3.1.CR1" conf="core->core"/>
</dependencies>
</ivy-module>
\ No newline at end of file
Modified: entitymanager/trunk/readme.txt
===================================================================
--- entitymanager/trunk/readme.txt 2008-03-06 23:26:31 UTC (rev 14402)
+++ entitymanager/trunk/readme.txt 2008-03-06 23:40:14 UTC (rev 14403)
@@ -1,6 +1,6 @@
Hibernate EntityManager
==================================================
-Version: 3.3.2.Beta2, 15.01.2008
+Version: 3.3.2.CR1, 6.03.2008
THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.GA (and above)
16 years, 3 months
Hibernate SVN: r14402 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 18:26:31 -0500 (Thu, 06 Mar 2008)
New Revision: 14402
Added:
entitymanager/tags/v3_3_2_CR1/
Log:
Release HEM 3.3.2.CR1
Copied: entitymanager/tags/v3_3_2_CR1 (from rev 14401, entitymanager/trunk)
16 years, 3 months
Hibernate SVN: r14401 - annotations/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 18:10:31 -0500 (Thu, 06 Mar 2008)
New Revision: 14401
Added:
annotations/tags/v3_3_1_CR1/
Log:
Hibernate Annotations 3.3.1.CR1 release
Copied: annotations/tags/v3_3_1_CR1 (from rev 14400, annotations/trunk)
16 years, 3 months
Hibernate SVN: r14400 - annotations/trunk.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 18:09:00 -0500 (Thu, 06 Mar 2008)
New Revision: 14400
Modified:
annotations/trunk/build.xml
annotations/trunk/changelog.txt
annotations/trunk/ivy.xml
annotations/trunk/readme.txt
Log:
Release
Modified: annotations/trunk/build.xml
===================================================================
--- annotations/trunk/build.xml 2008-03-06 22:19:34 UTC (rev 14399)
+++ annotations/trunk/build.xml 2008-03-06 23:09:00 UTC (rev 14400)
@@ -253,6 +253,11 @@
<include name="common-build.xml"/>
</fileset>
</copy>
+ <copy todir="${dist.dir}/ivy" failonerror="false">
+ <fileset dir="${ivy.jar.dir}">
+ <include name="**/*.*"/>
+ </fileset>
+ </copy>
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
@@ -268,6 +273,9 @@
<include name="*.jar"/>
</fileset>
</copy>
+ <copy todir="${dist.lib.dir}/test" failonerror="false">
+ <fileset file="${lib.dir}/test/*.jar"/>
+ </copy>
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
Modified: annotations/trunk/changelog.txt
===================================================================
--- annotations/trunk/changelog.txt 2008-03-06 22:19:34 UTC (rev 14399)
+++ annotations/trunk/changelog.txt 2008-03-06 23:09:00 UTC (rev 14400)
@@ -1,6 +1,30 @@
Hibernate Annotations Changelog
===============================
+3.3.1.CR1 (06-03-2008)
+----------------------
+
+** Bug
+ * [ANN-509] - referencedColumnName to non primary key foreign key column causes MappingException
+ * [ANN-590] - Alphabetical order issue when @ManyToOne is used in PrimaryKey and explicit referencedColumnName are used
+ * [ANN-653] - Exception when overriding collection mapping with @AssociationOverride
+ * [ANN-673] - Guaranty column order in genereted schema
+ * [ANN-676] - Composite PK/FK and the alphabetical order of class names
+ * [ANN-683] - AnnotationConfiguration hashCode collisions produce random binding failures
+ * [ANN-698] - Unbound property when default field access is used lead to unbound AnnotationException
+ * [ANN-699] - AnnotationBinder.mustBeSkipped references org.hibernate.tool.instrument.javassist.FieldHandler (hardcoded String-Reference)
+ * [ANN-700] - Hibernate's @NamedQuery always sets flushMode
+
+
+** Improvement
+ * [ANN-650] - Explicitly disallow @Version on @Embedded and throw meaningful Exception
+ * [ANN-690] - Override relevant Configuration methods in AnnotationConfiguration for method chaining
+
+** New Feature
+ * [ANN-442] - Support @GenericGenerators (Paul Cowan)
+ * [ANN-695] - Transparent integration of the new Hibernate Search collection event listeners
+
+
3.3.1.Beta1 (31-10-2007)
------------------------
Modified: annotations/trunk/ivy.xml
===================================================================
--- annotations/trunk/ivy.xml 2008-03-06 22:19:34 UTC (rev 14399)
+++ annotations/trunk/ivy.xml 2008-03-06 23:09:00 UTC (rev 14400)
@@ -13,6 +13,6 @@
</publications>
<dependencies>
<dependency name="jpa-api" rev="1.0.1.Beta1" conf="core->default"/>
- <dependency name="commons-annotations" rev="latest.integration" conf="core->core"/>
+ <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/>
</dependencies>
</ivy-module>
\ No newline at end of file
Modified: annotations/trunk/readme.txt
===================================================================
--- annotations/trunk/readme.txt 2008-03-06 22:19:34 UTC (rev 14399)
+++ annotations/trunk/readme.txt 2008-03-06 23:09:00 UTC (rev 14400)
@@ -1,6 +1,6 @@
Hibernate Annotations
==================================================
-Version: 3.3.1.Beta1, 31.10.2007
+Version: 3.3.1.CR1, 6.03.2008
THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.2.0.GA (and above)
16 years, 3 months
Hibernate SVN: r14399 - annotations/trunk/src/test/org/hibernate/test/annotations/query.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 17:19:34 -0500 (Thu, 06 Mar 2008)
New Revision: 14399
Modified:
annotations/trunk/src/test/org/hibernate/test/annotations/query/QueryAndSQLTest.java
Log:
ANN-700 revert test change
Modified: annotations/trunk/src/test/org/hibernate/test/annotations/query/QueryAndSQLTest.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2008-03-06 21:44:20 UTC (rev 14398)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2008-03-06 22:19:34 UTC (rev 14399)
@@ -374,7 +374,7 @@
@Override
protected String[] getXmlFiles() {
return new String[]{
- //"org/hibernate/test/annotations/query/orm.xml"
+ "org/hibernate/test/annotations/query/orm.xml"
};
}
}
16 years, 3 months
Hibernate SVN: r14398 - in entitymanager/trunk: src/java/org/hibernate/ejb and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 16:44:20 -0500 (Thu, 06 Mar 2008)
New Revision: 14398
Modified:
entitymanager/trunk/build.xml
entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
Log:
version number
Modified: entitymanager/trunk/build.xml
===================================================================
--- entitymanager/trunk/build.xml 2008-03-06 21:40:39 UTC (rev 14397)
+++ entitymanager/trunk/build.xml 2008-03-06 21:44:20 UTC (rev 14398)
@@ -17,7 +17,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate EntityManager"/>
<property name="name" value="hibernate-entitymanager"/>
- <property name="version" value="3.3.2.Beta3"/>
+ <property name="version" value="3.3.2.CR1"/>
<property name="javadoc.packagenames" value="org.hibernate.ejb.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-03-06 21:40:39 UTC (rev 14397)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-03-06 21:44:20 UTC (rev 14398)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.3.2.Beta3";
+ public static final String VERSION = "3.3.2.CR1";
private static Log log = LogFactory.getLog( Version.class );
static {
16 years, 3 months
Hibernate SVN: r14397 - in annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement: indexedCollection and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-03-06 16:40:39 -0500 (Thu, 06 Mar 2008)
New Revision: 14397
Added:
annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/
annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java
annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
Log:
ANN-701 Added test
Added: annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java 2008-03-06 21:40:39 UTC (rev 14397)
@@ -0,0 +1,20 @@
+//$
+package org.hibernate.test.annotations.collectionelement.indexedCollection;
+
+import javax.persistence.Embeddable;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Embeddable
+public class Contact {
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
Added: annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2008-03-06 21:40:39 UTC (rev 14397)
@@ -0,0 +1,32 @@
+//$
+package org.hibernate.test.annotations.collectionelement.indexedCollection;
+
+import org.hibernate.test.annotations.TestCase;
+import org.hibernate.Session;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class IndexedCollectionOfElementsTest extends TestCase {
+
+ public void testIndexedCollectionOfElements() throws Exception {
+ Sale sale = new Sale();
+ Contact contact = new Contact();
+ contact.setName( "Emmanuel" );
+ sale.getContacts().add(contact);
+ Session s = openSession( );
+ s.getTransaction().begin();
+ s.save( sale );
+ s.flush();
+ s.get( Sale.class, sale.getId() );
+ assertEquals( 1, sale.getContacts().size() );
+ s.getTransaction().rollback();
+ s.close();
+ }
+
+ protected Class[] getMappings() {
+ return new Class[] {
+ Sale.class
+ };
+ }
+}
Added: annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
===================================================================
--- annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java (rev 0)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java 2008-03-06 21:40:39 UTC (rev 14397)
@@ -0,0 +1,51 @@
+//$
+package org.hibernate.test.annotations.collectionelement.indexedCollection;
+
+import java.util.List;
+import java.util.ArrayList;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Column;
+
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.CollectionOfElements;
+import org.hibernate.annotations.CollectionId;
+import org.hibernate.annotations.GenericGenerator;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+@GenericGenerator(name="increment", strategy = "increment")
+public class Sale {
+ @Id @GeneratedValue private Integer id;
+
+ @CollectionOfElements
+ @JoinTable(
+ name = "contact",
+ joinColumns = @JoinColumn(name = "n_key_person"))
+ @CollectionId(
+ columns = @Column(name = "n_key_contact"),
+ type = @Type(type = "long"),
+ generator = "increment" )
+ private List<Contact> contacts = new ArrayList<Contact>();
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public List<Contact> getContacts() {
+ return contacts;
+ }
+
+ public void setContacts(List<Contact> contacts) {
+ this.contacts = contacts;
+ }
+}
16 years, 3 months