Hibernate SVN: r18543 - core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany.
by hibernate-commits＠lists.jboss.org
Author: smarlow(a)redhat.com
Date: 2010-01-13 14:35:54 -0500 (Wed, 13 Jan 2010)
New Revision: 18543
Added:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
Log:
HHH-4685 Make sure bidirectional @*To* works from an embedded object to another entity
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java 2010-01-13 19:35:54 UTC (rev 18543)
@@ -0,0 +1,24 @@
+package org.hibernate.test.annotations.manytomany;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Embeddable;
+import javax.persistence.ManyToMany;
+import java.util.List;
+
+@Embeddable
+public class ContactInfo {
+// @ManyToOne
+// Address address; // Unidirectional
+
+ List<PhoneNumber> phoneNumbers; // Bidirectional
+
+ @ManyToMany(cascade= CascadeType.ALL)
+ public List<PhoneNumber> getPhoneNumbers() {
+ return phoneNumbers;
+ }
+
+ public void setPhoneNumbers(List<PhoneNumber> phoneNumbers) {
+ this.phoneNumbers = phoneNumbers;
+ }
+
+}
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java 2010-01-13 18:04:02 UTC (rev 18542)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java 2010-01-13 19:35:54 UTC (rev 18543)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.Collection;
import javax.persistence.CascadeType;
+import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -26,7 +27,30 @@
private Integer id;
private Collection<Employer> employers;
private String name;
+ ContactInfo contactInfo;
+ JobInfo jobInfo;
+ // ContactInfo is for ManyToMany testing
+ @Embedded
+ public ContactInfo getContactInfo() {
+ return contactInfo;
+ }
+
+ public void setContactInfo(ContactInfo contactInfo) {
+ this.contactInfo = contactInfo;
+ }
+
+ // JobInfo is for OneToMany testing
+ @Embedded
+ public JobInfo getJobInfo() {
+ return jobInfo;
+ }
+
+ public void setJobInfo(JobInfo jobInfo) {
+ this.jobInfo = jobInfo;
+ }
+
+
@Column(name="fld_name")
public String getName() {
return name;
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java 2010-01-13 19:35:54 UTC (rev 18543)
@@ -0,0 +1,29 @@
+package org.hibernate.test.annotations.manytomany;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Embeddable;
+import javax.persistence.ManyToOne;
+
+@Embeddable
+public class JobInfo {
+ String jobDescription;
+ ProgramManager pm; // Bidirectional
+
+ public String getJobDescription() {
+ return jobDescription;
+ }
+
+ public void setJobDescription( String jobDescription ) {
+ this.jobDescription = jobDescription;
+ }
+
+ @ManyToOne( cascade= CascadeType.ALL)
+ public ProgramManager getPm() {
+ return pm;
+ }
+
+ public void setPm( ProgramManager pm ) {
+ this.pm = pm;
+ }
+
+}
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2010-01-13 18:04:02 UTC (rev 18542)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2010-01-13 19:35:54 UTC (rev 18543)
@@ -1,4 +1,5 @@
//$Id$
+//$Id$
package org.hibernate.test.annotations.manytomany;
@@ -7,6 +8,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import org.hibernate.Hibernate;
@@ -641,6 +643,81 @@
s.close();
}
+ // Test for HHH-4685
+ // Section 11.1.25
+ // The ManyToMany annotation may be used within an embeddable class contained within an entity class to specify a
+ // relationship to a collection of entities[101]. If the relationship is bidirectional and the entity containing
+ // the embeddable class is the owner of the relationship, the non-owning side must use the mappedBy element of the
+ // ManyToMany annotation to specify the relationship field or property of the embeddable class. The dot (".")
+ // notation syntax must be used in the mappedBy element to indicate the relationship attribute within the embedded
+ // attribute. The value of each identifier used with the dot notation is the name of the respective embedded field
+ // or property.
+ public void testManyToManyEmbeddableBiDirectionalDotNotationInMappedBy() throws Exception {
+ Session s;
+ Transaction tx;
+ s = openSession();
+ tx = s.beginTransaction();
+ Employee e = new Employee();
+ e.setName( "Sharon" );
+ List<PhoneNumber> phoneNumbers = new ArrayList<PhoneNumber>();
+ Collection<Employee> employees = new ArrayList<Employee>();
+ employees.add( e );
+ ContactInfo contactInfo = new ContactInfo();
+ PhoneNumber number = new PhoneNumber();
+ number.setEmployees( employees );
+ phoneNumbers.add( number );
+ contactInfo.setPhoneNumbers( phoneNumbers );
+ e.setContactInfo( contactInfo );
+ s.persist( e );
+ s.flush();
+ s.clear();
+ tx.commit();
+
+ tx.begin();
+ e = (Employee)s.get( e.getClass(),e.getId() );
+ // follow both directions of many to many association
+ assertEquals("same employee", e.getName(), e.getContactInfo().getPhoneNumbers().get(0).getEmployees().iterator().next().getName());
+ tx.commit();
+
+ s.close();
+ }
+
+ // Test for HHH-4685
+ // Section 11.1.26
+ // The ManyToOne annotation may be used within an embeddable class to specify a relationship from the embeddable
+ // class to an entity class. If the relationship is bidirectional, the non-owning OneToMany entity side must use the
+ // mappedBy element of the OneToMany annotation to specify the relationship field or property of the embeddable field
+ // or property on the owning side of the relationship. The dot (".") notation syntax must be used in the mappedBy
+ // element to indicate the relationship attribute within the embedded attribute. The value of each identifier used
+ // with the dot notation is the name of the respective embedded field or property.
+ public void testOneToManyEmbeddableBiDirectionalDotNotationInMappedBy() throws Exception {
+ Session s;
+ Transaction tx;
+ s = openSession();
+ tx = s.beginTransaction();
+ Employee e = new Employee();
+ JobInfo job = new JobInfo();
+ job.setJobDescription( "Sushi Chef" );
+ ProgramManager pm = new ProgramManager();
+ Collection<Employee> employees = new ArrayList<Employee>();
+ employees.add(e);
+ pm.setManages( employees );
+ job.setPm(pm);
+ e.setJobInfo( job );
+ s.persist( e );
+ s.flush();
+ s.clear();
+ tx.commit();
+
+ tx.begin();
+ e = (Employee) s.get( e.getClass(), e.getId() );
+ assertEquals( "same job in both directions",
+ e.getJobInfo().getJobDescription(),
+ e.getJobInfo().getPm().getManages().iterator().next().getJobInfo().getJobDescription() );
+ tx.commit();
+ s.close();
+ }
+
/**
* @see org.hibernate.test.annotations.TestCase#getMappings()
*/
@@ -664,7 +741,9 @@
Inspector.class,
InspectorPrefixes.class,
BuildingCompany.class,
- Building.class
+ Building.class,
+ PhoneNumber.class,
+ ProgramManager.class
};
}
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java 2010-01-13 19:35:54 UTC (rev 18543)
@@ -0,0 +1,31 @@
+package org.hibernate.test.annotations.manytomany;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import java.util.Collection;
+
+@Entity
+public class PhoneNumber {
+ int phNumber;
+ Collection<Employee> employees;
+
+ @Id
+ public int getPhNumber() {
+ return phNumber;
+ }
+
+ public void setPhNumber(int phNumber) {
+ this.phNumber = phNumber;
+ }
+
+ @ManyToMany(mappedBy="contactInfo.phoneNumbers", cascade= CascadeType.ALL)
+ public Collection<Employee> getEmployees() {
+ return employees;
+ }
+
+ public void setEmployees(Collection<Employee> employees) {
+ this.employees = employees;
+ }
+}
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java 2010-01-13 19:35:54 UTC (rev 18543)
@@ -0,0 +1,33 @@
+package org.hibernate.test.annotations.manytomany;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.Collection;
+
+@Entity
+public class ProgramManager {
+ int id;
+
+ Collection<Employee> manages;
+
+ @Id
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ @OneToMany( mappedBy="jobInfo.pm", cascade= CascadeType.ALL )
+ public Collection<Employee> getManages() {
+ return manages;
+ }
+
+ public void setManages( Collection<Employee> manages ) {
+ this.manages = manages;
+ }
+
+}
14 years, 4 months
Hibernate SVN: r18542 - in core/trunk/annotations/src/test: java/org/hibernate/test/annotations/idclass/xml and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-01-13 13:04:02 -0500 (Wed, 13 Jan 2010)
New Revision: 18542
Added:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
Log:
HHH-4282 Added the test attched to the jira issue to ensure the problems is really fixed by HHH-4528
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java 2010-01-13 18:04:02 UTC (rev 18542)
@@ -0,0 +1,148 @@
+// $Id: $
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.test.annotations.idclass.xml;
+
+import java.io.Serializable;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class HabitatSpeciesLink implements Serializable {
+ private static final long serialVersionUID = -7079021236893433038L;
+
+ private Long habitatId;
+
+ private Long speciesId;
+
+ public Long getHabitatId() {
+ return this.habitatId;
+ }
+
+ public void setHabitatId(Long newHabitatId) {
+ this.habitatId = newHabitatId;
+ }
+
+ public Long getSpeciesId() {
+ return this.speciesId;
+ }
+
+ public void setSpeciesId(Long newSpeciesId) {
+ this.speciesId = newSpeciesId;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ( ( this.getHabitatId() == null ) ? 0
+ : this.getHabitatId().hashCode() );
+ result = prime * result + ( ( this.getSpeciesId() == null ) ? 0
+ : this.getSpeciesId().hashCode() );
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj ) {
+ return true;
+ }
+ if ( obj == null ) {
+ return false;
+ }
+ if ( !( obj instanceof HabitatSpeciesLink ) ) {
+ return false;
+ }
+ final HabitatSpeciesLink other = ( HabitatSpeciesLink ) obj;
+ if ( this.getHabitatId() == null ) {
+ if ( other.getHabitatId() != null ) {
+ return false;
+ }
+ }
+ else if ( !this.getHabitatId().equals( other.getHabitatId() ) ) {
+ return false;
+ }
+ if ( this.getSpeciesId() == null ) {
+ if ( other.getSpeciesId() != null ) {
+ return false;
+ }
+ }
+ else if ( !this.getSpeciesId().equals( other.getSpeciesId() ) ) {
+ return false;
+ }
+ return true;
+ }
+
+ public static class HabitatSpeciesLinkId implements Serializable {
+ private Long habitatId;
+
+ private Long speciesId;
+
+ public Long getHabitatId() {
+ return this.habitatId;
+ }
+
+ public void setHabitatId(Long newHabitatId) {
+ this.habitatId = newHabitatId;
+ }
+
+ public Long getSpeciesId() {
+ return this.speciesId;
+ }
+
+ public void setSpeciesId(Long newSpeciesId) {
+ this.speciesId = newSpeciesId;
+ }
+
+ /**
+ * Equality must be implemented in terms of identity field equality, and
+ * must use instanceof rather than comparing classes directly (some JPA
+ * implementations may subclass the identity class).
+ */
+ public boolean equals(Object other) {
+ if ( other == this ) {
+ return true;
+ }
+ if ( !( other instanceof HabitatSpeciesLinkId ) ) {
+ return false;
+ }
+ HabitatSpeciesLinkId mi = ( HabitatSpeciesLinkId ) other;
+ return ( habitatId == mi.habitatId || ( habitatId != null && habitatId
+ .equals( mi.habitatId ) ) )
+ && ( speciesId == mi.speciesId || ( speciesId != null && speciesId
+ .equals( mi.speciesId ) ) );
+ }
+
+ /**
+ * Hashcode must also depend on identity values.
+ */
+ public int hashCode() {
+ return ( ( habitatId == null ) ? 0
+ : habitatId.hashCode() ) ^ ( ( speciesId == null ) ? 0
+ : speciesId.hashCode() );
+ }
+
+ public String toString() {
+ return "habitatId[" + habitatId + "],speciesId[" + speciesId + "]";
+ }
+ }
+}
\ No newline at end of file
Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java (from rev 18523, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java)
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java 2010-01-13 18:04:02 UTC (rev 18542)
@@ -0,0 +1,64 @@
+// $Id$
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.test.annotations.idclass.xml;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * HHH-4282
+ *
+ * @author Hardy Ferentschik
+ */
+public class IdClassXmlTest extends TestCase {
+
+ public void testEntityMappningPropertiesAreNotIgnored() {
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+
+ HabitatSpeciesLink link = new HabitatSpeciesLink();
+ link.setHabitatId( 1l );
+ link.setSpeciesId( 1l );
+ s.persist( link );
+
+ Query q = s.getNamedQuery( "testQuery" );
+ assertEquals( 1, q.list().size() );
+
+ tx.rollback();
+ s.close();
+ }
+
+ protected Class[] getMappings() {
+ return new Class[] {
+ HabitatSpeciesLink.class
+ };
+ }
+
+ protected String[] getXmlFiles() {
+ return new String[] {
+ "org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml"
+ };
+ }
+}
\ No newline at end of file
Added: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml 2010-01-13 18:04:02 UTC (rev 18542)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+ version="1.0">
+ <entity class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink" access="FIELD">
+ <table name="HABITAT_SPECIES_LINK"/>
+ <id-class
+ class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink$HabitatSpeciesLinkId"/>
+ <named-native-query name="testQuery"
+ result-class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink">
+ <query>select * from HABITAT_SPECIES_LINK link where link.HABITAT_LINK = 1</query>
+ </named-native-query>
+ <attributes>
+ <id name="habitatId">
+ <column name="HABITAT_LINK"/>
+ </id>
+ <id name="speciesId">
+ <column name="SPECIES_LINK"/>
+ </id>
+ </attributes>
+ </entity>
+</entity-mappings>
+
14 years, 4 months
Hibernate SVN: r18541 - search/tags.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 08:41:33 -0500 (Wed, 13 Jan 2010)
New Revision: 18541
Added:
search/tags/v3_1_1_GA_CP01/
Log:
JBPAPP-3397 create tags for eap 5.0.1
Copied: search/tags/v3_1_1_GA_CP01 (from rev 18540, search/branches/v3_1_1_GA_CP)
14 years, 4 months
Hibernate SVN: r18540 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 08:39:05 -0500 (Wed, 13 Jan 2010)
New Revision: 18540
Added:
entitymanager/tags/3.4.0.GA_CP01/
Log:
JBPAPP-3397 create tags for eap 5.0.1
Copied: entitymanager/tags/3.4.0.GA_CP01 (from rev 18539, entitymanager/branches/v3_4_0_GA_CP)
14 years, 4 months
Hibernate SVN: r18539 - annotations/tags.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 08:36:04 -0500 (Wed, 13 Jan 2010)
New Revision: 18539
Added:
annotations/tags/3.4.0.GA_CP01/
Log:
JBPAPP-3397 create tags for eap 5.0.1
Copied: annotations/tags/3.4.0.GA_CP01 (from rev 18538, annotations/branches/v3_4_0_GA_CP)
14 years, 4 months
Hibernate SVN: r18538 - in core/trunk/entitymanager/src: test/java/org/hibernate/ejb/criteria/basic and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-01-13 07:47:55 -0500 (Wed, 13 Jan 2010)
New Revision: 18538
Added:
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java
Log:
HHH-4785 - BinaryArithmeticOperation reverses incoming arguments
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java 2010-01-13 12:20:43 UTC (rev 18537)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java 2010-01-13 12:47:55 UTC (rev 18538)
@@ -115,19 +115,19 @@
* @param criteriaBuilder The builder for query components.
* @param resultType The operation result type
* @param operator The operator (type of operation).
+ * @param lhs The left-hand operand.
* @param rhs The right-hand operand
- * @param lhs The left-hand operand.
*/
public BinaryArithmeticOperation(
CriteriaBuilderImpl criteriaBuilder,
Class<N> resultType,
Operation operator,
- Expression<? extends N> rhs,
- Expression<? extends N> lhs) {
+ Expression<? extends N> lhs,
+ Expression<? extends N> rhs) {
super( criteriaBuilder, resultType );
this.operator = operator;
+ this.lhs = lhs;
this.rhs = rhs;
- this.lhs = lhs;
}
/**
@@ -136,40 +136,40 @@
* @param criteriaBuilder The builder for query components.
* @param javaType The operation result type
* @param operator The operator (type of operation).
- * @param rhs The right-hand operand
- * @param lhs The left-hand operand (the literal).
+ * @param lhs The left-hand operand
+ * @param rhs The right-hand operand (the literal)
*/
public BinaryArithmeticOperation(
CriteriaBuilderImpl criteriaBuilder,
Class<N> javaType,
Operation operator,
- Expression<? extends N> rhs,
- N lhs) {
+ Expression<? extends N> lhs,
+ N rhs) {
super( criteriaBuilder, javaType );
this.operator = operator;
- this.rhs = rhs;
- this.lhs = new LiteralExpression<N>( criteriaBuilder, lhs );
+ this.lhs = lhs;
+ this.rhs = new LiteralExpression<N>( criteriaBuilder, rhs );
}
/**
- * Creates an arithmethic operation based on an expression and a literal.
+ * Creates an arithmetic operation based on an expression and a literal.
*
* @param criteriaBuilder The builder for query components.
* @param javaType The operation result type
* @param operator The operator (type of operation).
- * @param rhs The right-hand operand (the literal).
- * @param lhs The left-hand operand
+ * @param lhs The left-hand operand (the literal)
+ * @param rhs The right-hand operand
*/
public BinaryArithmeticOperation(
CriteriaBuilderImpl criteriaBuilder,
Class<N> javaType,
Operation operator,
- N rhs,
- Expression<? extends N> lhs) {
+ N lhs,
+ Expression<? extends N> rhs) {
super( criteriaBuilder, javaType );
this.operator = operator;
- this.rhs = new LiteralExpression<N>( criteriaBuilder, rhs );
- this.lhs = lhs;
+ this.lhs = new LiteralExpression<N>( criteriaBuilder, lhs );
+ this.rhs = rhs;
}
public Operation getOperator() {
return operator;
Added: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java (rev 0)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java 2010-01-13 12:47:55 UTC (rev 18538)
@@ -0,0 +1,83 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. 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 Inc.
+ *
+ * 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.ejb.criteria.basic;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+
+import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest;
+import org.hibernate.ejb.metamodel.Product;
+
+/**
+ * Tests that various expressions operate as expected
+ *
+ * @author Steve Ebersole
+ */
+public class ExpressionsTest extends AbstractMetamodelSpecificTest {
+ private CriteriaBuilder builder;
+
+ @Override
+ public void setUp() {
+ super.setUp();
+ builder = factory.getCriteriaBuilder();
+ EntityManager em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ Product product = new Product();
+ product.setId( "product1" );
+ product.setPrice( 1.23d );
+ product.setQuantity( 2 );
+ product.setPartNumber( Integer.MAX_VALUE + 1 );
+ product.setRating( 1.999f );
+ product.setSomeBigInteger( BigInteger.valueOf( 987654321 ) );
+ product.setSomeBigDecimal( BigDecimal.valueOf( 987654.321 ) );
+ em.persist( product );
+ em.getTransaction().commit();
+ em.close();
+ }
+
+ @Override
+ public void tearDown() {
+ EntityManager em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ em.createQuery( "delete Product" ).executeUpdate();
+ em.getTransaction().commit();
+ em.close();
+ super.tearDown();
+ }
+
+ public void testDiff() {
+ EntityManager em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
+ criteria.from( Product.class );
+ criteria.select( builder.diff( builder.literal( 5 ), builder.literal( 2 ) ) );
+ Integer result = em.createQuery( criteria ).getSingleResult();
+ assertEquals( Integer.valueOf( 3 ), result );
+ em.getTransaction().commit();
+ em.close();
+ }
+}
14 years, 4 months
Hibernate SVN: r18537 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 07:20:43 -0500 (Wed, 13 Jan 2010)
New Revision: 18537
Added:
core/tags/hibernate-3.3.2.GA_CP01/
Log:
JBPAPP-3397 create tags for eap 5.0.1
Copied: core/tags/hibernate-3.3.2.GA_CP01 (from rev 18536, core/branches/Branch_3_3_2_GA_CP)
14 years, 4 months
Hibernate SVN: r18536 - in core/branches/Branch_3_3_2_GA_CP: cache-ehcache and 18 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 05:56:22 -0500 (Wed, 13 Jan 2010)
New Revision: 18536
Modified:
core/branches/Branch_3_3_2_GA_CP/cache-ehcache/pom.xml
core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/pom.xml
core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml
core/branches/Branch_3_3_2_GA_CP/cache-oscache/pom.xml
core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/pom.xml
core/branches/Branch_3_3_2_GA_CP/connection-c3p0/pom.xml
core/branches/Branch_3_3_2_GA_CP/connection-proxool/pom.xml
core/branches/Branch_3_3_2_GA_CP/core/pom.xml
core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml
core/branches/Branch_3_3_2_GA_CP/documentation/manual/pom.xml
core/branches/Branch_3_3_2_GA_CP/documentation/pom.xml
core/branches/Branch_3_3_2_GA_CP/hibernate-maven-plugin/pom.xml
core/branches/Branch_3_3_2_GA_CP/jmx/pom.xml
core/branches/Branch_3_3_2_GA_CP/parent/pom.xml
core/branches/Branch_3_3_2_GA_CP/pom.xml
core/branches/Branch_3_3_2_GA_CP/testing/pom.xml
core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml
core/branches/Branch_3_3_2_GA_CP/tutorials/eg/pom.xml
core/branches/Branch_3_3_2_GA_CP/tutorials/pom.xml
core/branches/Branch_3_3_2_GA_CP/tutorials/web/pom.xml
Log:
JBPAPP-3396 update the version in the pom.xml and readme.txt, changelog and something else
Modified: core/branches/Branch_3_3_2_GA_CP/cache-ehcache/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-ehcache/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/cache-ehcache/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/cache-oscache/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-oscache/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/cache-oscache/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/connection-c3p0/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/connection-c3p0/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/connection-c3p0/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/connection-proxool/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/connection-proxool/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/connection-proxool/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/core/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/core/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/documentation/manual/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/documentation/manual/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/documentation/manual/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/documentation/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/documentation/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/documentation/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/hibernate-maven-plugin/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/hibernate-maven-plugin/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/hibernate-maven-plugin/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -29,7 +29,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/jmx/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/jmx/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/jmx/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -32,7 +32,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/branches/Branch_3_3_2_GA_CP/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
@@ -103,7 +103,4 @@
</modules>
</profile>
</profiles>
- <properties>
- <parentVersion>3.3.2.GA_CP01</parentVersion>
- </properties>
</project>
\ No newline at end of file
Modified: core/branches/Branch_3_3_2_GA_CP/testing/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testing/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/testing/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/eg/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/tutorials/eg/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/tutorials/eg/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/tutorials/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/tutorials/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -31,7 +31,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/web/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/tutorials/web/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
+++ core/branches/Branch_3_3_2_GA_CP/tutorials/web/pom.xml 2010-01-13 10:56:22 UTC (rev 18536)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>${parentVersion}</version>
+ <version>3.3.2.GA_CP01</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 4 months
Hibernate SVN: r18535 - in search/branches/v3_1_1_GA_CP: hibernate-search-archetype and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 03:32:44 -0500 (Wed, 13 Jan 2010)
New Revision: 18535
Modified:
search/branches/v3_1_1_GA_CP/changelog.txt
search/branches/v3_1_1_GA_CP/hibernate-search-archetype/pom.xml
search/branches/v3_1_1_GA_CP/hibernate-search-archetype/src/main/resources/archetype-resources/pom.xml
search/branches/v3_1_1_GA_CP/pom.xml
search/branches/v3_1_1_GA_CP/readme.txt
search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/master.xml
search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/modules/getting-started.xml
search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/Version.java
Log:
JBPAPP-3396 update the version in the pom.xml and readme.txt, changelog and something else
Modified: search/branches/v3_1_1_GA_CP/changelog.txt
===================================================================
--- search/branches/v3_1_1_GA_CP/changelog.txt 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/changelog.txt 2010-01-13 08:32:44 UTC (rev 18535)
@@ -1,6 +1,18 @@
Hibernate Search Changelog
==========================
+3.1.1.GA_CP01 (12-01-2010)
+---------------------------
+
+
+** Bug
+ * [JBPAPP-3316] - org.hibernate.search.test.engine.LazyCollectionsUpdatingTest fails on most DB by a NPE
+** Task
+
+ * [JBPAPP-2923] - CLONE -Modify Annotations, Entity Manager, and Search to work with the same property settings as Core
+ * [JBPAPP-3210] - Hibernate Search branch v3_1_1_GA_CP depends on core 3.3.1 which should be 3.3.2
+ * [JBPAPP-3217] - enable test case on others db
+
3.1.1.GA (28-05-2009)
---------------------
Modified: search/branches/v3_1_1_GA_CP/hibernate-search-archetype/pom.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/hibernate-search-archetype/pom.xml 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/hibernate-search-archetype/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
@@ -3,5 +3,5 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-quickstart</artifactId>
<packaging>jar</packaging>
- <version>3.1.1.GA</version>
+ <version>3.1.1.GA_CP01</version>
</project>
Modified: search/branches/v3_1_1_GA_CP/hibernate-search-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/hibernate-search-archetype/src/main/resources/archetype-resources/pom.xml 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/hibernate-search-archetype/src/main/resources/archetype-resources/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.1.1.GA</version>
+ <version>3.1.1.GA_CP01</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -23,12 +23,12 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
Modified: search/branches/v3_1_1_GA_CP/pom.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/pom.xml 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/pom.xml 2010-01-13 08:32:44 UTC (rev 18535)
@@ -34,7 +34,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
<packaging>jar</packaging>
- <version>3.1.1.GA</version>
+ <version>3.1.1.GA_CP01</version>
<name>Hibernate Search</name>
<description>Hibernate Search</description>
@@ -56,9 +56,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/tags/v3_1_1_GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/search/tags/v3_1_1_GA</developerConnection>
- <url>http://fisheye.jboss.com/browse/Hibernate/search/tags/v3_1_1_GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/tags/v3_1_1_GA_CP01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/search/tags/v3_1_1_GA_CP01</developerConnection>
+ <url>http://fisheye.jboss.com/browse/Hibernate/search/tags/v3_1_1_GA_CP01</url>
</scm>
<issueManagement>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
+ <version>3.3.2.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -790,13 +790,13 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: search/branches/v3_1_1_GA_CP/readme.txt
===================================================================
--- search/branches/v3_1_1_GA_CP/readme.txt 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/readme.txt 2010-01-13 08:32:44 UTC (rev 18535)
@@ -1,6 +1,6 @@
Hibernate Search
==================================================
-Version: 3.1.1.GA, 28.05.2009
+Version: 3.1.1.GA_CP01, 13.01.2010
Description
-----------
Modified: search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/master.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/master.xml 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/master.xml 2010-01-13 08:32:44 UTC (rev 18535)
@@ -25,8 +25,8 @@
-->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY versionNumber "3.1.1.GA">
-<!ENTITY copyrightYear "2004">
+<!ENTITY versionNumber "3.1.1.GA_CP01">
+<!ENTITY copyrightYear "2010">
<!ENTITY copyrightHolder "Red Hat Middleware, LLC.">
]>
<book lang="en">
Modified: search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/modules/getting-started.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/modules/getting-started.xml 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/src/main/docbook/en-US/modules/getting-started.xml 2010-01-13 08:32:44 UTC (rev 18535)
@@ -129,17 +129,17 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.1.1.GA</version>
+ <version>3.1.1.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
@@ -639,7 +639,7 @@
<programlisting>mvn archetype:create \
-DarchetypeGroupId=org.hibernate \
-DarchetypeArtifactId=hibernate-search-quickstart \
- -DarchetypeVersion=3.1.1.GA \
+ -DarchetypeVersion=3.1.1.GA_CP01 \
-DgroupId=my.company -DartifactId=quickstart</programlisting>
</example>
Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/Version.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/Version.java 2010-01-13 08:07:46 UTC (rev 18534)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/Version.java 2010-01-13 08:32:44 UTC (rev 18535)
@@ -8,7 +8,7 @@
*/
public class Version {
- public static final String VERSION = "3.1.1.GA";
+ public static final String VERSION = "3.1.1.GA_CP01";
static {
LoggerFactory.make().info( "Hibernate Search {}", VERSION );
14 years, 4 months
Hibernate SVN: r18534 - in entitymanager/branches/v3_4_0_GA_CP: src/main/docbook/en and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-01-13 03:07:46 -0500 (Wed, 13 Jan 2010)
New Revision: 18534
Modified:
entitymanager/branches/v3_4_0_GA_CP/changelog.txt
entitymanager/branches/v3_4_0_GA_CP/pom.xml
entitymanager/branches/v3_4_0_GA_CP/readme.txt
entitymanager/branches/v3_4_0_GA_CP/src/main/docbook/en/master.xml
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java
Log:
JBPAPP-3396 update the version in the pom.xml and readme.txt, changelog and something else
Modified: entitymanager/branches/v3_4_0_GA_CP/changelog.txt
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/changelog.txt 2010-01-13 08:03:57 UTC (rev 18533)
+++ entitymanager/branches/v3_4_0_GA_CP/changelog.txt 2010-01-13 08:07:46 UTC (rev 18534)
@@ -1,7 +1,23 @@
Hibernate EntityManager Changelog
==================================
- 3.4.0.GA (20-08-2008)
+3.4.0.GA_CP01 (13-01-2010)
+----------------------------
+
+** Bug
+ * [JBPAPP-1998] - EJB-438 - Wrong exception thrown on optimistic locking failure due to deleted entity using hibernate.jdbc.batch_versioned_data=false
+ * [JBPAPP-2862] - CLONE -Sybase - EntityManager - unit tests using LOBs fail
+ * [JBPAPP-3314] - org.hibernate.ejb.test.callbacks.CallbackAndDirtyTest.testDirtyButNotDirty fails on PostgreSQL
+ * [JBPAPP-3320] - org.hibernate.ejb.test.inheritance.InheritanceTest fails on Oracle due to the 'size' keyword
+ * [JBPAPP-3377] - some EM test doesn't be tested on other DBs
+** Task
+
+ * [JBPAPP-2923] - CLONE -Modify Annotations, Entity Manager, and Search to work with the same property settings as Core
+ * [JBPAPP-3217] - enable test case on others db
+ * [JBPAPP-3153] - change the build tool of Hibernate EM(eap 5 cp branch)
+
+
+3.4.0.GA (20-08-2008)
----------------------
** Bug
Modified: entitymanager/branches/v3_4_0_GA_CP/pom.xml
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/pom.xml 2010-01-13 08:03:57 UTC (rev 18533)
+++ entitymanager/branches/v3_4_0_GA_CP/pom.xml 2010-01-13 08:07:46 UTC (rev 18534)
@@ -33,7 +33,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<packaging>jar</packaging>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
<name>Hibernate Entity Manager</name>
<description>Hibernate Entity Manager</description>
@@ -108,12 +108,12 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
+ <version>3.3.2.GA_CP01</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: entitymanager/branches/v3_4_0_GA_CP/readme.txt
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/readme.txt 2010-01-13 08:03:57 UTC (rev 18533)
+++ entitymanager/branches/v3_4_0_GA_CP/readme.txt 2010-01-13 08:07:46 UTC (rev 18534)
@@ -1,6 +1,6 @@
Hibernate EntityManager
==================================================
-Version: @version@, @releasedate@
+Version: 3.4.0.GA_CP01, 13-01-2010
THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.3 (and above)
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/docbook/en/master.xml
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/docbook/en/master.xml 2010-01-13 08:03:57 UTC (rev 18533)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/docbook/en/master.xml 2010-01-13 08:07:46 UTC (rev 18534)
@@ -16,7 +16,7 @@
<subtitle>User guide</subtitle>
- <releaseinfo>3.4.0.GA</releaseinfo>
+ <releaseinfo>3.4.0.GA_CP01</releaseinfo>
<mediaobject>
<imageobject>
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java 2010-01-13 08:03:57 UTC (rev 18533)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java 2010-01-13 08:07:46 UTC (rev 18534)
@@ -9,7 +9,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.4.0.GA";
+ public static final String VERSION = "3.4.0.GA_CP01";
private static final Logger log = LoggerFactory.getLogger( Version.class );
static {
14 years, 4 months