December 2009 - hibernate-commits

Hibernate SVN: r18147 - entitymanager/branches/v3_4_0_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-05 13:18:55 -0500 (Sat, 05 Dec 2009) New Revision: 18147 Modified: entitymanager/branches/v3_4_0_GA_CP/ivy.xml entitymanager/branches/v3_4_0_GA_CP/pom.xml Log: JBPAPP-3224 update hibernate entitymanager dependency of core Modified: entitymanager/branches/v3_4_0_GA_CP/ivy.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/ivy.xml 2009-12-05 17:08:22 UTC (rev 18146) +++ entitymanager/branches/v3_4_0_GA_CP/ivy.xml 2009-12-05 18:18:55 UTC (rev 18147) @@ -16,7 +16,7 @@ <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/> <dependency name="annotations" rev="3.4.0.GA" conf="default->default"/> - <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.SP1" conf="default->default"/> + <dependency org="org.hibernate" name="hibernate-core" rev="3.3.2.GA" conf="default->default"/> <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/> <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/> <dependency org="javassist" name="javassist" rev="3.4.GA" conf="default->default"/> Modified: entitymanager/branches/v3_4_0_GA_CP/pom.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/pom.xml 2009-12-05 17:08:22 UTC (rev 18146) +++ entitymanager/branches/v3_4_0_GA_CP/pom.xml 2009-12-05 18:18:55 UTC (rev 18147) @@ -39,7 +39,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.0.SP1</version> + <version>3.3.2.GA</version> </dependency> <dependency> <groupId>org.slf4j</groupId>

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18146 - search/branches/v3_1_1_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-05 12:08:22 -0500 (Sat, 05 Dec 2009) New Revision: 18146 Modified: search/branches/v3_1_1_GA_CP/pom.xml Log: JBPAPP-3218 update db profile in hibernate eap 5 cp branch Modified: search/branches/v3_1_1_GA_CP/pom.xml =================================================================== --- search/branches/v3_1_1_GA_CP/pom.xml 2009-12-05 15:45:52 UTC (rev 18145) +++ search/branches/v3_1_1_GA_CP/pom.xml 2009-12-05 17:08:22 UTC (rev 18146) @@ -284,258 +284,338 @@ </distributionManagement> <profiles> -  - <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> +  + <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> -  - <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> +  + <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> -  + First, those with OSS drivers + ################################################################### + --> -  - <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://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <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://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> +  + <profile> + <id>mysql51</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> -  - <profile> - <id>postgresql824</id> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> +  + <profile> + <id>postgresql824</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504.jdbc3</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> -  - <profile> - <id>postgresql837</id> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> +  + <profile> + <id>postgresql837</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504.jdbc3</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> -  +  -  - <profile> - <id>db2v97</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.57.86</version> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.57.86</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://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa +  + <profile> + <id>db2v97</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.86</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.86</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://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa </jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>db2v91</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://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>db2v91</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://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>oracle9i</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> -  - <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>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>oracle9i</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <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>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>oracle10g</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> -  - <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:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10 +  + <profile> + <id>oracle10g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <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:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10 </jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> +  + <profile> + <id>oracle11g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  + <profile> + <id>oracle11gRAC</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  + <profile> + <id>sybase15</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>sybase15</id> - <dependencies> - <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> - <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>mssql2005</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>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> -  - <profile> - <id>mssql2005</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>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation>4096</jdbc.isolation> - </properties> - </profile> +  + <profile> + <id>mssql2008</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>2.0.1008.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile>

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18145 - annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-05 10:45:52 -0500 (Sat, 05 Dec 2009) New Revision: 18145 Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntity.java annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntityId.java Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java Log: JBPAPP-3223 HHH-3164 id in with EmbeddedId and criteria API Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java 2009-12-05 15:44:55 UTC (rev 18144) +++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/CompositeIdTest.java 2009-12-05 15:45:52 UTC (rev 18145) @@ -1,12 +1,17 @@ //$Id$ package org.hibernate.test.annotations.cid; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.criterion.Disjunction; +import org.hibernate.criterion.Restrictions; +import org.hibernate.dialect.HSQLDialect; import org.hibernate.test.annotations.TestCase; /** @@ -258,6 +263,61 @@ s.close(); } + public void testQueryInAndComposite() { + if( getDialect() instanceof HSQLDialect){ + return; + } + Session s = openSession( ); + Transaction transaction = s.beginTransaction(); + + SomeEntity someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 1 ); + someEntity.getId().setVersion( 11 ); + someEntity.setProp( "aa" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 1 ); + someEntity.getId().setVersion( 12 ); + someEntity.setProp( "bb" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 10 ); + someEntity.getId().setVersion( 21 ); + someEntity.setProp( "cc1" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 10 ); + someEntity.getId().setVersion( 22 ); + someEntity.setProp( "cc2" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 10 ); + someEntity.getId().setVersion( 23 ); + someEntity.setProp( "cc3" ); + s.persist( someEntity ); + + s.flush(); + + List ids = new ArrayList<SomeEntityId>(2); + ids.add( new SomeEntityId(1,12) ); + ids.add( new SomeEntityId(10,23) ); + + Criteria criteria = s.createCriteria( SomeEntity.class ); + Disjunction disjunction = Restrictions.disjunction(); + + disjunction.add( Restrictions.in( "id", ids ) ); + criteria.add( disjunction ); + + List list = criteria.list(); + assertEquals( 2, list.size() ); + transaction.rollback(); + s.close(); + } protected Class[] getMappings() { return new Class[] { Parent.class, @@ -274,7 +334,8 @@ LittleGenius.class, A.class, B.class, - C.class + C.class, + SomeEntity.class }; } } Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntity.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntity.java (rev 0) +++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntity.java 2009-12-05 15:45:52 UTC (rev 18145) @@ -0,0 +1,49 @@ +package org.hibernate.test.annotations.cid; + +import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Basic; + +/** + * @author bartek + */ +@Entity +public class SomeEntity + implements Serializable { + + @Id + private SomeEntityId id; + + @Basic + private String prop; + + /** + * @return the id + */ + public SomeEntityId getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(SomeEntityId id) { + this.id = id; + } + + /** + * @return the prop + */ + public String getProp() { + return prop; + } + + /** + * @param prop the prop to set + */ + public void setProp(String prop) { + this.prop = prop; + } + +} Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntityId.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntityId.java (rev 0) +++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cid/SomeEntityId.java 2009-12-05 15:45:52 UTC (rev 18145) @@ -0,0 +1,78 @@ +package org.hibernate.test.annotations.cid; + +import java.io.Serializable; +import javax.persistence.Embeddable; + +import org.hibernate.annotations.*; + +/** + * @author bartek + */ +@Embeddable +public class SomeEntityId implements Serializable { + private Integer id; + + private Integer version; + + @org.hibernate.annotations.Parent + private SomeEntity parent; + + /** + * + */ + public SomeEntityId() { + super(); + } + + /** + * @param i + * @param j + */ + public SomeEntityId(int id, int version) { + super(); + this.id = id; + this.version = version; + } + + /** + * @return the id + */ + public int getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(int id) { + this.id = id; + } + + /** + * @return the version + */ + public int getVersion() { + return version; + } + + /** + * @param version the version to set + */ + public void setVersion(int version) { + this.version = version; + } + + /** + * @return the parent + */ + public SomeEntity getParent() { + return parent; + } + + /** + * @param parent the parent to set + */ + public void setParent(SomeEntity parent) { + this.parent = parent; + } +}

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18144 - core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-05 10:44:55 -0500 (Sat, 05 Dec 2009) New Revision: 18144 Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/InExpression.java Log: JBPAPP-3223 HHH-3164 id in with EmbeddedId and criteria API Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/InExpression.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/InExpression.java 2009-12-05 15:37:20 UTC (rev 18143) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/InExpression.java 2009-12-05 15:44:55 UTC (rev 18144) @@ -50,8 +50,8 @@ if ( type.isComponentType() ) { AbstractComponentType actype = (AbstractComponentType) type; Type[] types = actype.getSubtypes(); - for ( int i=0; i<types.length; i++ ) { - for ( int j=0; j<values.length; j++ ) { + for ( int j=0; j<values.length; j++ ) { + for ( int i=0; i<types.length; i++ ) { Object subval = values[j]==null ? null : actype.getPropertyValues( values[j], EntityMode.POJO )[i];

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18143 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-05 10:37:20 -0500 (Sat, 05 Dec 2009) New Revision: 18143 Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java Log: JBPAPP-3223 HHH-3164 id in with EmbeddedId and criteria API Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java 2009-12-05 15:36:35 UTC (rev 18142) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java 2009-12-05 15:37:20 UTC (rev 18143) @@ -70,8 +70,8 @@ if ( type.isComponentType() ) { AbstractComponentType actype = (AbstractComponentType) type; Type[] types = actype.getSubtypes(); - for ( int i=0; i<types.length; i++ ) { - for ( int j=0; j<values.length; j++ ) { + for ( int j=0; j<values.length; j++ ) { + for ( int i=0; i<types.length; i++ ) { Object subval = values[j]==null ? null : actype.getPropertyValues( values[j], EntityMode.POJO )[i];

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18142 - annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-05 10:36:35 -0500 (Sat, 05 Dec 2009) New Revision: 18142 Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java Log: JBPAPP-3223 HHH-3164 id in with EmbeddedId and criteria API Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2009-12-05 12:07:27 UTC (rev 18141) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2009-12-05 15:36:35 UTC (rev 18142) @@ -1,12 +1,18 @@ //$Id$ package org.hibernate.test.annotations.cid; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.criterion.Disjunction; +import org.hibernate.criterion.Restrictions; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.HSQLDialect; import org.hibernate.test.annotations.TestCase; /** @@ -258,6 +264,61 @@ s.close(); } + public void testQueryInAndComposite() { + if(Dialect.getDialect() instanceof HSQLDialect){ + return; + } + Session s = openSession( ); + Transaction transaction = s.beginTransaction(); + + SomeEntity someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 1 ); + someEntity.getId().setVersion( 11 ); + someEntity.setProp( "aa" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 1 ); + someEntity.getId().setVersion( 12 ); + someEntity.setProp( "bb" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 10 ); + someEntity.getId().setVersion( 21 ); + someEntity.setProp( "cc1" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 10 ); + someEntity.getId().setVersion( 22 ); + someEntity.setProp( "cc2" ); + s.persist( someEntity ); + someEntity = new SomeEntity(); + someEntity.setId( new SomeEntityId( ) ); + someEntity.getId().setId( 10 ); + someEntity.getId().setVersion( 23 ); + someEntity.setProp( "cc3" ); + s.persist( someEntity ); + + s.flush(); + + List ids = new ArrayList<SomeEntityId>(2); + ids.add( new SomeEntityId(1,12) ); + ids.add( new SomeEntityId(10,23) ); + + Criteria criteria = s.createCriteria( SomeEntity.class ); + Disjunction disjunction = Restrictions.disjunction(); + + disjunction.add( Restrictions.in( "id", ids ) ); + criteria.add( disjunction ); + + List list = criteria.list(); + assertEquals( 2, list.size() ); + transaction.rollback(); + s.close(); + } protected Class[] getMappings() { return new Class[] { Parent.class, @@ -274,7 +335,8 @@ LittleGenius.class, A.class, B.class, - C.class + C.class, + SomeEntity.class }; } } Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java 2009-12-05 15:36:35 UTC (rev 18142) @@ -0,0 +1,49 @@ +package org.hibernate.test.annotations.cid; + +import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Basic; + +/** + * @author bartek + */ +@Entity +public class SomeEntity + implements Serializable { + + @Id + private SomeEntityId id; + + @Basic + private String prop; + + /** + * @return the id + */ + public SomeEntityId getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(SomeEntityId id) { + this.id = id; + } + + /** + * @return the prop + */ + public String getProp() { + return prop; + } + + /** + * @param prop the prop to set + */ + public void setProp(String prop) { + this.prop = prop; + } + +} Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java 2009-12-05 15:36:35 UTC (rev 18142) @@ -0,0 +1,78 @@ +package org.hibernate.test.annotations.cid; + +import java.io.Serializable; +import javax.persistence.Embeddable; + +import org.hibernate.annotations.*; + +/** + * @author bartek + */ +@Embeddable +public class SomeEntityId implements Serializable { + private Integer id; + + private Integer version; + + @org.hibernate.annotations.Parent + private SomeEntity parent; + + /** + * + */ + public SomeEntityId() { + super(); + } + + /** + * @param i + * @param j + */ + public SomeEntityId(int id, int version) { + super(); + this.id = id; + this.version = version; + } + + /** + * @return the id + */ + public int getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(int id) { + this.id = id; + } + + /** + * @return the version + */ + public int getVersion() { + return version; + } + + /** + * @param version the version to set + */ + public void setVersion(int version) { + this.version = version; + } + + /** + * @return the parent + */ + public SomeEntity getParent() { + return parent; + } + + /** + * @param parent the parent to set + */ + public void setParent(SomeEntity parent) { + this.parent = parent; + } +}

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18141 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-12-05 07:07:27 -0500 (Sat, 05 Dec 2009) New Revision: 18141 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java Log: HV-266 Added a null check for traversableProperty.getName() Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java 2009-12-05 12:01:41 UTC (rev 18140) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java 2009-12-05 12:07:27 UTC (rev 18141) @@ -28,10 +28,10 @@ */ public class JPATraversableResolver implements TraversableResolver { - // TODO Check the call to PersistenceUtil. traversableProperty.getName() is this correct? + // we have to check traversableProperty.getName() against null to check the root gets validated (see HV-266) public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { - return traversableObject == null || - Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty.getName() ); + return traversableObject == null || traversableProperty.getName() == null || Persistence.getPersistenceUtil() + .isLoaded( traversableObject, traversableProperty.getName() ); } public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) {

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18140 - validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-12-05 07:01:41 -0500 (Sat, 05 Dec 2009) New Revision: 18140 Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java Log: javadoc Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java 2009-12-04 19:49:12 UTC (rev 18139) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java 2009-12-05 12:01:41 UTC (rev 18140) @@ -46,9 +46,9 @@ * Helper class that deals with all constraint-related stuff, such as * determining whether a given annotation represents a constraint annotation or * whether a given annotation is allowed to be declared at a given element. - * + * * @author Gunnar Morling - * + * */ public class ConstraintHelper { @@ -57,22 +57,22 @@ * ("javax.validation.constraints"). */ private final Name CONSTRAINT_ANNOTATION_PACKAGE_NAME; - + private static Map<Name, Set<TypeElement>> builtInConstraints; - + private Elements elementUtils; - + private Types typeUtils; public ConstraintHelper(Elements elementUtils, Types typeUtils) { this.elementUtils = elementUtils; this.typeUtils = typeUtils; - + CONSTRAINT_ANNOTATION_PACKAGE_NAME = elementUtils.getName(Size.class.getPackage().getName()); - + builtInConstraints = CollectionHelper.newHashMap(); - + //TODO GM: register all types registerAllowedTypesForBuiltInConstraint(Size.class, CollectionHelper.<Class<?>>asSet(Collection.class, String.class)); registerAllowedTypesForBuiltInConstraint(AssertTrue.class, CollectionHelper.<Class<?>>asSet(Boolean.class, boolean.class)); @@ -85,9 +85,8 @@ * or not. That's the case, if the given element is annotated with the * {@link Constraint} meta-annotation (which is only allowed at annotation * declarations). - * - * @param The - * element of interest. + * + * @param typeElement The element of interest. * @return True, if the given element is a constraint annotation type, false * otherwise. */ @@ -96,55 +95,55 @@ } public boolean isAnnotationAllowedAtElement(DeclaredType annotationType, Element annotatedElement) { - + Set<TypeElement> allowedTypesForConstraint = getAllowedTypesForConstraint(annotationType); - + if(allowedTypesForConstraint.isEmpty()) { return false; } - + Element typeElementOfAnnotatedElement = typeUtils.asElement(annotatedElement.asType()); - - + + if(allowedTypesForConstraint.contains(typeElementOfAnnotatedElement)) { return true; } - + List<? extends TypeMirror> directSupertypes = typeUtils.directSupertypes(annotatedElement.asType()); - + while(!directSupertypes.isEmpty()) { List<TypeMirror> nextSupertypes = CollectionHelper.newArrayList(); for (TypeMirror oneSuperType : directSupertypes) { - + Element oneSuperTypeAsElement = typeUtils.asElement(oneSuperType); - + if(allowedTypesForConstraint.contains(oneSuperTypeAsElement)) { return true; } - + nextSupertypes.addAll(typeUtils.directSupertypes(oneSuperType)); } - + directSupertypes = nextSupertypes; } - - + + return false; } // ================================== // private API below // ================================== - + /** * Returns a set with all those type elements, at which the given constraint annotation * type may be specified. - * + * * @param annotationType * @return */ private Set<TypeElement> getAllowedTypesForConstraint(DeclaredType annotationType) { - + if(isBuiltInConstraint(annotationType)) { return getAllowedTypesFromBuiltInConstraint(annotationType); } @@ -152,117 +151,117 @@ return getAllowedTypesFromCustomConstraint(annotationType); } } - + private Set<TypeElement> getAllowedTypesFromBuiltInConstraint(DeclaredType builtInAnnotationType) { - + Set<TypeElement> theValue = builtInConstraints.get(builtInAnnotationType.asElement().getSimpleName()); - + if(theValue == null) { theValue = Collections.emptySet(); - } - + } + return theValue; } - + /** * Returns a set containing all those types, at which the specified custom * constraint-annotation is allowed. - * + * * @param customInAnnotationType * A custom constraint type. - * + * * @return A set with all types supported by the given constraint. May be * empty in case of constraint composition, if there is no common * type supported by all composing constraints. - * + * * TODO GM: consider constraint composition */ private Set<TypeElement> getAllowedTypesFromCustomConstraint(DeclaredType customInAnnotationType) { - + Set<TypeElement> theValue = CollectionHelper.newHashSet(); - + //the Constraint meta-annotation at the type declaration, e.g. "@Constraint(validatedBy = CheckCaseValidator.class)" AnnotationMirror constraintMetaAnnotation = getConstraintMetaAnnotation(customInAnnotationType); - + if(constraintMetaAnnotation == null) { return theValue; } - + //the validator classes, e.g. [CheckCaseValidator.class] List<? extends AnnotationValue> validatorClassReferences = getValidatorClassesFromConstraintMetaAnnotation(constraintMetaAnnotation); for (AnnotationValue oneValidatorClassReference : validatorClassReferences) { - + DeclaredType validatorType = (DeclaredType)oneValidatorClassReference.getValue(); - + //contains the bindings of the type parameters from the implemented ConstraintValidator //interface, e.g. "ConstraintValidator<CheckCase, String>" DeclaredType constraintValidatorImplementation = getConstraintValidatorSuperType(validatorType); - + if(constraintValidatorImplementation != null) { - + //2nd type parameter contains the data type supported by current validator class, e.g. "String" TypeMirror supportedTypeParameter = constraintValidatorImplementation.getTypeArguments().get(1); theValue.add((TypeElement)typeUtils.asElement(supportedTypeParameter)); } } - + return theValue; } - + private DeclaredType getConstraintValidatorSuperType(DeclaredType type) { - + List<? extends TypeMirror> directSupertypes = typeUtils.directSupertypes(type); - + for (TypeMirror typeMirror : directSupertypes) { if(typeUtils.asElement(typeMirror).getSimpleName().contentEquals(ConstraintValidator.class.getSimpleName())) { return (DeclaredType)typeMirror; } } - + return null; } - + /** * Retrieves the {@link Constraint} meta-annotation from the given constraint annotation. - * + * * @param annotationType A constraint type. - * + * * @return The Constraint meta-annotation or null if it isn't specified at the given type. */ private AnnotationMirror getConstraintMetaAnnotation(DeclaredType annotationType) { - + List<? extends AnnotationMirror> annotationMirrors = annotationType.asElement().getAnnotationMirrors(); - + return new AnnotationApiHelper(elementUtils, typeUtils).getMirror(annotationMirrors, Constraint.class); } - + private List<? extends AnnotationValue> getValidatorClassesFromConstraintMetaAnnotation(AnnotationMirror constraintMetaAnnotation) { - + Map<? extends ExecutableElement, ? extends AnnotationValue> elementValues = constraintMetaAnnotation.getElementValues(); - + for (Entry<? extends ExecutableElement, ? extends AnnotationValue> oneElementValue : elementValues.entrySet()) { - + if(oneElementValue.getKey().getSimpleName().contentEquals("validatedBy")) { - + //this is save, as we know that the "validatedBy" attribute is an array of classes @SuppressWarnings("unchecked") List<? extends AnnotationValue> validatorClasses = (List<? extends AnnotationValue>)oneElementValue.getValue().getValue(); - + return validatorClasses; } } - + return Collections.emptyList(); } - + private void registerAllowedTypesForBuiltInConstraint(Class<? extends Annotation> annotation, Set<Class<?>> allowedTypes) { - + Set<TypeElement> allowedTypesAsElements = CollectionHelper.newHashSet(); - + for (Class<?> oneType : allowedTypes) { TypeElement typeElement = elementUtils.getTypeElement(oneType.getCanonicalName()); - + if(typeElement != null) { allowedTypesAsElements.add(typeElement); } @@ -270,26 +269,25 @@ builtInConstraints.put(elementUtils.getName(annotation.getSimpleName()), allowedTypesAsElements); } - + /** * Checks, whether the given type is a built-in constraint annotation (which * is the case, if is annotated with the {@link Constraint} meta-annotation * and is declared in the package <code>javax.validation.constraints</code>). - * + * * @param annotationType * The type to check. * @return True, if the given type is a constraint annotation, false * otherwise. */ private boolean isBuiltInConstraint(DeclaredType annotationType) { - + Element element = annotationType.asElement(); - + if(element.getAnnotation(Constraint.class) == null) { return false; } - + return CONSTRAINT_ANNOTATION_PACKAGE_NAME.equals(elementUtils.getPackageOf(element).getQualifiedName()); } - } \ No newline at end of file

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18139 - annotations/branches/v3_4_0_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-04 14:49:12 -0500 (Fri, 04 Dec 2009) New Revision: 18139 Modified: annotations/branches/v3_4_0_GA_CP/pom.xml Log: JBPAPP-3218 update db profile Modified: annotations/branches/v3_4_0_GA_CP/pom.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/pom.xml 2009-12-04 18:35:05 UTC (rev 18138) +++ annotations/branches/v3_4_0_GA_CP/pom.xml 2009-12-04 19:49:12 UTC (rev 18139) @@ -415,77 +415,98 @@ </reporting> - <profiles> -  - <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> + <profiles> +  + <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> -  - <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> +  + <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> -  +  - <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://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> + First, those with OSS drivers + ################################################################### + --> +  + <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://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> +  + <profile> + <id>mysql51</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  <profile> <id>postgresql824</id> @@ -528,11 +549,11 @@ </properties> </profile> -  +   <profile> @@ -560,114 +581,174 @@ </properties> </profile> -  - <profile> - <id>db2v91</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://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>db2v91</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://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>oracle9i</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> -  - <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>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>oracle9i</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <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>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>oracle10g</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> -  - <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>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>oracle10g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <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:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10 + </jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> +  + <profile> + <id>oracle11g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  + <profile> + <id>oracle11gRAC</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation/> + </properties> + </profile> +  + <profile> + <id>sybase15</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> -  - <profile> - <id>sybase15</id> - <dependencies> - <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> - <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url> - <jdbc.user>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation /> - </properties> - </profile> +  + <profile> + <id>mssql2005</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>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> -  - <profile> - <id>mssql2005</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>hibbr330</jdbc.user> - <jdbc.pass>hibbr330</jdbc.pass> - <jdbc.isolation>4096</jdbc.isolation> - </properties> - </profile> - - </profiles> +  + <profile> + <id>mssql2008</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>2.0.1008.2-4</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> + <jdbc.user>hibbr330</jdbc.user> + <jdbc.pass>hibbr330</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + </profiles> <properties> <slf4jVersion>1.5.8</slf4jVersion> </properties>

14 years, 7 months

1
0
0 / 0

Hibernate SVN: r18138 - core/branches/Branch_3_3_2_GA_CP/parent.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2009-12-04 13:35:05 -0500 (Fri, 04 Dec 2009) New Revision: 18138 Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml Log: JBPAPP-3218 correct sid of oracle11g Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2009-12-04 16:35:40 UTC (rev 18137) +++ core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2009-12-04 18:35:05 UTC (rev 18138) @@ -640,7 +640,7 @@ <properties> <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:hibbr330</jdbc.url> + <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> <jdbc.user>hibbr330</jdbc.user> <jdbc.pass>hibbr330</jdbc.pass> <jdbc.isolation/>

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits December 2009