April 2010 - hibernate-commits - Jboss List Archives

Hibernate SVN: r19262 - beanvalidation/tck/trunk.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-04-21 05:11:58 -0400 (Wed, 21 Apr 2010) New Revision: 19262 Modified: beanvalidation/tck/trunk/pom.xml Log: BVTCK-6 Modified: beanvalidation/tck/trunk/pom.xml =================================================================== --- beanvalidation/tck/trunk/pom.xml 2010-04-21 09:01:47 UTC (rev 19261) +++ beanvalidation/tck/trunk/pom.xml 2010-04-21 09:11:58 UTC (rev 19262) @@ -306,16 +306,14 @@ <distributionManagement> <repository> -  -  -  - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> </repository> <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> </snapshotRepository> </distributionManagement>

14 years

1
0
0 / 0

Hibernate SVN: r19261 - jpamodelgen/trunk.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-04-21 05:01:47 -0400 (Wed, 21 Apr 2010) New Revision: 19261 Modified: jpamodelgen/trunk/pom.xml Log: METAGEN-31 Modified: jpamodelgen/trunk/pom.xml =================================================================== --- jpamodelgen/trunk/pom.xml 2010-04-21 08:37:46 UTC (rev 19260) +++ jpamodelgen/trunk/pom.xml 2010-04-21 09:01:47 UTC (rev 19261) @@ -334,15 +334,14 @@ <distributionManagement> <repository> -  -  - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> </repository> <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> </snapshotRepository> </distributionManagement>

14 years

1
0
0 / 0

Hibernate SVN: r19260 - in search/trunk: hibernate-search and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-04-21 04:37:46 -0400 (Wed, 21 Apr 2010) New Revision: 19260 Modified: search/trunk/hibernate-search-testing/pom.xml search/trunk/hibernate-search/pom.xml search/trunk/pom.xml Log: HSEARCH-510 Updated sitribution management Modified: search/trunk/hibernate-search/pom.xml =================================================================== --- search/trunk/hibernate-search/pom.xml 2010-04-21 07:50:29 UTC (rev 19259) +++ search/trunk/hibernate-search/pom.xml 2010-04-21 08:37:46 UTC (rev 19260) @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -    -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <groupId>org.hibernate</groupId> <artifactId>hibernate-search-parent</artifactId> <version>3.2.0-SNAPSHOT</version> <packaging>pom</packaging> - + <name>Hibernate Search Parent</name> <description>Hibernate Search Parent POM</description> <url>http://search.hibernate.org</url> - + <modules> <module>hibernate-search</module> <module>hibernate-search-testing</module> <module>hibernate-search-archetype</module> </modules> - + <issueManagement> <system>JIRA</system> <url>http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH</url> </issueManagement> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/trunk</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/search/trunk</developerConnection> <url>http://fisheye.jboss.com/browse/Hibernate/search/trunk</url> </scm> - + <organization> <name>Hibernate</name> <url>http://www.hibernate.org</url> </organization> - + <licenses> <license> <name>GNU Lesser General Public License</name> @@ -64,7 +65,7 @@ <comments>See discussion at http://hibernate.org/356.html for more details.</comments> </license> </licenses> - + <ciManagement> <system>Hudson</system> <url>http://hudson.jboss.org/hudson/view/hibernate/job/hibernate-search-trunk/</url> @@ -88,7 +89,7 @@ <url>http://in.relation.to/Bloggers/Sanne</url> </developer> </developers> - + <mailingLists> <mailingList> <name>Hibernate Announcements</name> @@ -122,7 +123,7 @@ <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive> </mailingList> </mailingLists> - + <properties> <slf4jVersion>1.5.8</slf4jVersion> <luceneVersion>2.9.2</luceneVersion> @@ -130,7 +131,7 @@ <hibernateCommonsAnnotationVersion>3.2.0.Final</hibernateCommonsAnnotationVersion> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - + <dependencies> <dependency> <groupId>org.slf4j</groupId> @@ -143,8 +144,8 @@ <version>${slf4jVersion}</version> <scope>test</scope> </dependency> - </dependencies> - + </dependencies> + <dependencyManagement> <dependencies> <dependency> @@ -219,50 +220,50 @@ <artifactId>solr-lucene-core</artifactId> </exclusion> <exclusion> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.solr</groupId> - <artifactId>solr-commons-csv</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-highlighter</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queries</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-memory</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-misc</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-spellchecker</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers</artifactId> - </exclusion> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </exclusion> <exclusion> + <groupId>org.apache.solr</groupId> + <artifactId>solr-commons-csv</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.lucene</groupId> + <artifactId>lucene-highlighter</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queries</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-memory</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-misc</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-spellchecker</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> <artifactId>lucene-snowball</artifactId> </exclusion> - + </exclusions> </dependency> <dependency> @@ -297,7 +298,7 @@ </dependency> </dependencies> </dependencyManagement> - + <build> <defaultGoal>install</defaultGoal> <plugins> @@ -411,22 +412,20 @@ </plugins> </pluginManagement> </build> - + <distributionManagement> <repository> -  -  -  - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> </repository> <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> </snapshotRepository> </distributionManagement> - + <profiles>   @@ -450,8 +449,8 @@ <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> <jdbc.url>jdbc:hsqldb:.</jdbc.url> <jdbc.user>sa</jdbc.user> - <jdbc.pass /> - <jdbc.isolation /> + <jdbc.pass/> + <jdbc.isolation/> </properties> </profile>  - +  <profile> <id>mysql5</id> @@ -478,10 +477,10 @@ <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/searctru</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>mysql51</id> @@ -498,10 +497,10 @@ <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/searctru</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>mysql51-cluster</id> @@ -519,10 +518,10 @@ </jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>postgresql824</id> @@ -540,10 +539,10 @@ <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:searctru</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>postgresql837</id> @@ -561,10 +560,10 @@ <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:searctru</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>postgresql84</id> @@ -581,16 +580,16 @@ <jdbc.url>jdbc:postgresql://notinstalled.lab.eng.bos.redhat.com:5432:searctru</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  - +  <profile> <id>db2v82</id> @@ -612,10 +611,10 @@ <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>db2v91</id> @@ -637,10 +636,10 @@ <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>db2v97</id> @@ -662,10 +661,10 @@ <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>oracle9i</id> @@ -683,10 +682,10 @@ <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>oracle10g</id> @@ -704,10 +703,10 @@ <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>oracle11g</id> @@ -724,10 +723,10 @@ <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>oracle11gRAC</id> @@ -746,10 +745,10 @@ </jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>sybase15</id> @@ -766,10 +765,10 @@ <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/searctru</jdbc.url> <jdbc.user>searctru</jdbc.user> <jdbc.pass>searctru</jdbc.pass> - <jdbc.isolation /> + <jdbc.isolation/> </properties> </profile> - +  <profile> <id>mssql2005</id> @@ -789,7 +788,7 @@ <jdbc.isolation>4096</jdbc.isolation> </properties> </profile> - +  <profile> <id>mssql2008</id>

14 years

1
0
0 / 0

Hibernate SVN: r19258 - core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/subclassfilter.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-04-21 01:15:41 -0400 (Wed, 21 Apr 2010) New Revision: 19258 Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml Log: HHH-5140 quoted column doesn't be quoted in sub-query Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml =================================================================== --- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml 2010-04-21 05:14:40 UTC (rev 19257) +++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml 2010-04-21 05:15:41 UTC (rev 19258) @@ -16,7 +16,7 @@ <property name="region"/> <union-subclass name="Employee" table="UEmployee"> - <property name="title"/> + <property name="title" column="`unique`"/> <property name="department" column="dept"/> <many-to-one name="manager" column="mgr_id" class="Employee" cascade="none"/> <set name="minions" inverse="true" lazy="true" cascade="all">

14 years

1
0
0 / 0

Hibernate SVN: r19257 - core/branches/Branch_3_5/core/src/main/java/org/hibernate/persister/entity.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-04-21 01:14:40 -0400 (Wed, 21 Apr 2010) New Revision: 19257 Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java Log: HHH-5140 quoted column doesn't be quoted in sub-query Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java 2010-04-21 01:58:27 UTC (rev 19256) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java 2010-04-21 05:14:40 UTC (rev 19257) @@ -423,7 +423,7 @@ buf.append( dialect.getSelectClauseNullString(sqlType) ) .append(" as "); } - buf.append( col.getName() ); + buf.append( col.getQuotedName( dialect ) ); buf.append(", "); } buf.append( clazz.getSubclassId() )

14 years

1
0
0 / 0

Hibernate SVN: r19256 - in core/trunk: annotations and 20 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-04-20 21:58:27 -0400 (Tue, 20 Apr 2010) New Revision: 19256 Modified: core/trunk/annotations/pom.xml core/trunk/cache-ehcache/pom.xml core/trunk/cache-infinispan/pom.xml core/trunk/cache-jbosscache/pom.xml core/trunk/cache-oscache/pom.xml core/trunk/cache-swarmcache/pom.xml core/trunk/connection-c3p0/pom.xml core/trunk/connection-proxool/pom.xml core/trunk/core/pom.xml core/trunk/distribution/pom.xml core/trunk/documentation/envers/pom.xml core/trunk/documentation/manual/pom.xml core/trunk/documentation/pom.xml core/trunk/entitymanager/pom.xml core/trunk/envers/pom.xml core/trunk/jdbc3-testing/pom.xml core/trunk/jdbc4-testing/pom.xml core/trunk/jmx/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml core/trunk/testing/pom.xml core/trunk/testsuite/pom.xml Log: [maven-release-plugin] prepare release Branch_3_5 Modified: core/trunk/annotations/pom.xml =================================================================== --- core/trunk/annotations/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/annotations/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -29,7 +29,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-ehcache/pom.xml =================================================================== --- core/trunk/cache-ehcache/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/cache-ehcache/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-infinispan/pom.xml =================================================================== --- core/trunk/cache-infinispan/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/cache-infinispan/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/cache-jbosscache/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -27,7 +27,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-oscache/pom.xml =================================================================== --- core/trunk/cache-oscache/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/cache-oscache/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-swarmcache/pom.xml =================================================================== --- core/trunk/cache-swarmcache/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/cache-swarmcache/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/connection-c3p0/pom.xml =================================================================== --- core/trunk/connection-c3p0/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/connection-c3p0/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/connection-proxool/pom.xml =================================================================== --- core/trunk/connection-proxool/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/connection-proxool/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/core/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/distribution/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -30,7 +30,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/envers/pom.xml =================================================================== --- core/trunk/documentation/envers/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/documentation/envers/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/documentation/manual/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/pom.xml =================================================================== --- core/trunk/documentation/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/documentation/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/entitymanager/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/envers/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/jdbc3-testing/pom.xml =================================================================== --- core/trunk/jdbc3-testing/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/jdbc3-testing/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -28,7 +28,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/jdbc4-testing/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -28,7 +28,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/jmx/pom.xml =================================================================== --- core/trunk/jmx/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/jmx/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -29,7 +29,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/parent/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -29,7 +29,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> <packaging>pom</packaging> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <name>Hibernate Core Parent POM</name> <description>The base POM for all Hibernate Core modules.</description> @@ -54,9 +54,9 @@ </licenses> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</developerConnection> - <url>https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</url> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection> + <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> </scm> <ciManagement> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>parent/pom.xml</relativePath> </parent> Modified: core/trunk/testing/pom.xml =================================================================== --- core/trunk/testing/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/testing/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) +++ core/trunk/testsuite/pom.xml 2010-04-21 01:58:27 UTC (rev 19256) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent>

14 years

1
0
0 / 0

Hibernate SVN: r19255 - in core/branches: Branch_3_5/annotations/src/main/java/org/hibernate/annotations and 19 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-04-20 21:57:44 -0400 (Tue, 20 Apr 2010) New Revision: 19255 Added: core/branches/Branch_3_5/ core/branches/Branch_3_5/entitymanager/pom.xml core/branches/Branch_3_5/parent/pom.xml Removed: core/branches/Branch_3_5/entitymanager/pom.xml core/branches/Branch_3_5/parent/pom.xml Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/AccessType.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/Version.java core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java core/branches/Branch_3_5/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java Log: [maven-release-plugin] copy for branch Branch_3_5 Copied: core/branches/Branch_3_5 (from rev 19253, core/trunk) Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/AccessType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AccessType.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/AccessType.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ @AnyMetaDefs( @AnyMetaDef( name= "Property", metaType = "string", idType = "integer", metaValues = { Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.EmbeddedId; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.Serializable; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Column; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.EmbeddedId; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.Serializable; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.PrintWriter; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.id.entities; public enum Planet { Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import org.hibernate.cfg.EJB3NamingStrategy; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import java.util.HashSet; Deleted: core/branches/Branch_3_5/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,202 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <packaging>jar</packaging> - - <name>Hibernate Entity Manager</name> - <description>Hibernate Entity Manager</description> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-api</artifactId> - <version>1.0.0-alpha-6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-impl-base</artifactId> - <version>1.0.0-alpha-6</version> - <scope>test</scope> - </dependency> - <dependency> -  - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-jpamodelgen</artifactId> - <version>1.0.0.Final</version> - <scope>test</scope> - <exclusions> - <exclusion> -  - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - <testResource> - <filtering>true</filtering> - <directory>src/test/bundles</directory> - <targetPath>../bundles</targetPath> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-injection-plugin</artifactId> - <configuration> - <bytecodeInjections> - <bytecodeInjection> - <expression>${pom.version}</expression> - <targetMembers> - <methodBodyReturn> - <className>org.hibernate.ejb.Version</className> - <methodName>getVersionString</methodName> - </methodBodyReturn> - </targetMembers> - </bytecodeInjection> - </bytecodeInjections> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> -  - <configuration> - <tasks> - <property name="target.dir" value="${project.build.directory}/generated-src/jpamodelgen"/> - <property name="src.dir" value="${project.build.testSourceDirectory}"/> - <property name="jdk16_home" value="${jdk16_home}"/> - <property name="classpath" refid="maven.test.classpath"/> - <ant antfile="${basedir}/build.xml"> - <target name="generate-metamodel"/> - </ant> - </tasks> - </configuration> - <executions> - <execution> - <id>process_annotations</id> - <phase>process-test-sources</phase> - <configuration> -  - <testSourceRoot>${project.build.directory}/generated-src/jpamodelgen</testSourceRoot> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/*TestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>doc</id> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory> - <masterTranslation>en</masterTranslation> - <imageResource> - <directory>${basedir}/src/main/docbook/en/images</directory> - </imageResource> - </configuration> - <executions> - <execution> - <id>make-doc</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> Copied: core/branches/Branch_3_5/entitymanager/pom.xml (from rev 19254, core/trunk/entitymanager/pom.xml) =================================================================== --- core/branches/Branch_3_5/entitymanager/pom.xml (rev 0) +++ core/branches/Branch_3_5/entitymanager/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -0,0 +1,202 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.5.2-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <packaging>jar</packaging> + + <name>Hibernate Entity Manager</name> + <description>Hibernate Entity Manager</description> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-api</artifactId> + <version>1.0.0-alpha-6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-impl-base</artifactId> + <version>1.0.0-alpha-6</version> + <scope>test</scope> + </dependency> + <dependency> +  + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-jpamodelgen</artifactId> + <version>1.0.0.Final</version> + <scope>test</scope> + <exclusions> + <exclusion> +  + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/bundles</directory> + <targetPath>../bundles</targetPath> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-injection-plugin</artifactId> + <configuration> + <bytecodeInjections> + <bytecodeInjection> + <expression>${pom.version}</expression> + <targetMembers> + <methodBodyReturn> + <className>org.hibernate.ejb.Version</className> + <methodName>getVersionString</methodName> + </methodBodyReturn> + </targetMembers> + </bytecodeInjection> + </bytecodeInjections> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> +  + <configuration> + <tasks> + <property name="target.dir" value="${project.build.directory}/generated-src/jpamodelgen" /> + <property name="src.dir" value="${project.build.testSourceDirectory}" /> + <property name="jdk16_home" value="${jdk16_home}" /> + <property name="classpath" refid="maven.test.classpath" /> + <ant antfile="${basedir}/build.xml"> + <target name="generate-metamodel" /> + </ant> + </tasks> + </configuration> + <executions> + <execution> + <id>process_annotations</id> + <phase>process-test-sources</phase> + <configuration> +  + <testSourceRoot>${project.build.directory}/generated-src/jpamodelgen</testSourceRoot> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*TestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>doc</id> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory> + <masterTranslation>en</masterTranslation> + <imageResource> + <directory>${basedir}/src/main/docbook/en/images</directory> + </imageResource> + </configuration> + <executions> + <execution> + <id>make-doc</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Modified: core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/Version.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/Version.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/Version.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as * indicated by the @author tags or express copyright attribution Modified: core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as * indicated by the @author tags or express copyright attribution Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.ejb.test.exception; import java.io.Serializable; Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.ejb.test.exception; import java.io.Serializable; Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Deleted: core/branches/Branch_3_5/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/parent/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,941 +0,0 @@ -<?xml version="1.0"?> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <packaging>pom</packaging> - <version>3.5.2-SNAPSHOT</version> - - <name>Hibernate Core Parent POM</name> - <description>The base POM for all Hibernate Core modules.</description> - <url>http://hibernate.org</url> - <inceptionYear>2002</inceptionYear> - - <organization> - <name>Hibernate.org</name> - <url>http://hibernate.org</url> - </organization> - - <developers> - </developers> - - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - <comments>See discussion at http://hibernate.org/356.html for more details.</comments> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection> - <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> - </scm> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.jboss.org/hudson/job/hibernate-testsuite/</url> - <notifiers> - <notifier> - <type>mail</type> - <address>hibernate-dev(a)lists.jboss.org</address> - </notifier> - </notifiers> - </ciManagement> - - <issueManagement> - <system>jira</system> - <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</url> - </issueManagement> - - <mailingLists> - <mailingList> - <name>Hibernate Announcements</name> - <post>hibernate-announce(a)lists.jboss.org</post> - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe> - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe> - <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> - </mailingList> - <mailingList> - <name>Hibernate Commit Notificatons</name> - <post>hibernate-commits(a)lists.jboss.org</post> - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe> - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe> - <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive> - </mailingList> - <mailingList> - <name>Hibernate Developers</name> - <post>hibernate-dev(a)lists.jboss.org</post> - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe> - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe> - <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> - <otherArchives> - <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive> - </otherArchives> - </mailingList> - <mailingList> - <name>Hibernate Issue Notifications</name> - <post>hibernate-issues(a)lists.jboss.org</post> - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe> - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe> - <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive> - </mailingList> - </mailingLists> - - <build> - <plugins> - <plugin> -  - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-style-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-java</id> - <goals> - <goal>enforce</goal> - </goals> - </execution> - </executions> - <configuration> - <rules> - <requireJavaVersion> -  - <version>[1.5,1.6)</version> - </requireJavaVersion> - <requireMavenVersion> -  -  - <version>(2.0.7,)</version> - </requireMavenVersion> - </rules> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-URL>http://hibernate.org</Implementation-URL> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - <argLine>-Xmx1024m</argLine> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.2.3</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>2.0.1</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl - </stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> -  -  - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - </options> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-style-plugin</artifactId> - <version>2.0.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> - <configuration> - <links> - <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> - <link>http://java.sun.com/j2ee/1.4/docs/api/</link> - </links> - <packagesheader>Hibernate Packages</packagesheader> - <doctitle>Hibernate Core ${project.version}</doctitle> - <windowtitle>Hibernate Core ${project.version}</windowtitle> - <bottom><![CDATA[Copyright © ${inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a> All Rights Reserved]]></bottom> - <excludePackageNames>orh.hibernate.tutorial*</excludePackageNames> - <groups> - <group> - <title>Core API</title> - <packages> - org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.mapping:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.stat - </packages> - </group> - <group> - <title>Extension SPI/API</title> - <packages> - org.hibernate.id*:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc:org.hibernate.usertype - </packages> - </group> - <group> - <title>JBoss Cache Integration</title> - <packages>org.hibernate.cache.jbc2*</packages> - </group> - <group> - <title>Miscellaneous API</title> - <packages>org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.tool.instrument*</packages> - </group> - </groups> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-test-ext-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <goals> - <goal>extend</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-injection-plugin</artifactId> - <version>1.0.2</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>bytecode</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-scm</artifactId> - <version>1.0-beta-6</version> - </extension> - <extension> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-manager-plexus</artifactId> - <version>1.0</version> - </extension> - <extension> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-svnexe</artifactId> - <version>1.0</version> - </extension> - </extensions> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.1.1</version> - <configuration> - <onlyAnalyze>org.hibernate.*</onlyAnalyze> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4jVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> -  - </dependencies> - - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.6</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.9.0.GA</version> - </dependency> -  - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.2</version> - </dependency> -  - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.0.Final</version> - </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.2.0.Final</version> - </dependency> -  - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - </dependency> - </dependencies> - </dependencyManagement> - - <distributionManagement> - <repository> -  -  -  - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> - - <profiles> -  -  -  -  - <profile> - <id>hsqldb</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> - <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> - <jdbc.url>jdbc:hsqldb:.</jdbc.url> - <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> - </properties> - </profile> - - <profile> - <id>h2</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.124</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> - <jdbc.driver>org.h2.Driver</jdbc.driver> - <jdbc.url>jdbc:h2:mem:db1</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> - <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://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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/hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>mysql51-cluster</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.8</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> - <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru - </jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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:hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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:hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - -  - <profile> - <id>db2v82</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.1.57</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> - <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>db2v91</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.8.47</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.8.47</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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>db2v97</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.57.86</version> - <scope>test</scope> - </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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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> - <scope>test</scope> - </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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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> - <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:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>sybase15</id> - <dependencies> - <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> - <scope>test</scope> - </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:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>mssql2005</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://dev30.qa.atl.jboss.com:3918</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</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>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation>4096</jdbc.isolation> - </properties> - </profile> - - </profiles> - - <properties> - <slf4jVersion>1.5.8</slf4jVersion> - </properties> -</project> Copied: core/branches/Branch_3_5/parent/pom.xml (from rev 19254, core/trunk/parent/pom.xml) =================================================================== --- core/branches/Branch_3_5/parent/pom.xml (rev 0) +++ core/branches/Branch_3_5/parent/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -0,0 +1,941 @@ +<?xml version="1.0"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <packaging>pom</packaging> + <version>3.5.2-SNAPSHOT</version> + + <name>Hibernate Core Parent POM</name> + <description>The base POM for all Hibernate Core modules.</description> + <url>http://hibernate.org</url> + <inceptionYear>2002</inceptionYear> + + <organization> + <name>Hibernate.org</name> + <url>http://hibernate.org</url> + </organization> + + <developers> + </developers> + + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> + <comments>See discussion at http://hibernate.org/356.html for more details.</comments> + <distribution>repo</distribution> + </license> + </licenses> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</developerConnection> + <url>https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</url> + </scm> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.jboss.org/hudson/job/hibernate-testsuite/</url> + <notifiers> + <notifier> + <type>mail</type> + <address>hibernate-dev(a)lists.jboss.org</address> + </notifier> + </notifiers> + </ciManagement> + + <issueManagement> + <system>jira</system> + <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</url> + </issueManagement> + + <mailingLists> + <mailingList> + <name>Hibernate Announcements</name> + <post>hibernate-announce(a)lists.jboss.org</post> + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe> + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe> + <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> + </mailingList> + <mailingList> + <name>Hibernate Commit Notificatons</name> + <post>hibernate-commits(a)lists.jboss.org</post> + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe> + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe> + <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive> + </mailingList> + <mailingList> + <name>Hibernate Developers</name> + <post>hibernate-dev(a)lists.jboss.org</post> + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe> + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe> + <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> + <otherArchives> + <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive> + </otherArchives> + </mailingList> + <mailingList> + <name>Hibernate Issue Notifications</name> + <post>hibernate-issues(a)lists.jboss.org</post> + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe> + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe> + <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive> + </mailingList> + </mailingLists> + + <build> + <plugins> + <plugin> +  + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-java</id> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + <configuration> + <rules> + <requireJavaVersion> +  + <version>[1.5,1.6)</version> + </requireJavaVersion> + <requireMavenVersion> +  +  + <version>(2.0.7,)</version> + </requireMavenVersion> + </rules> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Implementation-URL>http://hibernate.org</Implementation-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <argLine>-Xmx1024m</argLine> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.3</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>2.0.1</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl + </stylesheetResource> + <finalName>hibernate_reference.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + </options> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <version>2.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> + <configuration> + <links> + <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> + <link>http://java.sun.com/j2ee/1.4/docs/api/</link> + </links> + <packagesheader>Hibernate Packages</packagesheader> + <doctitle>Hibernate Core ${project.version}</doctitle> + <windowtitle>Hibernate Core ${project.version}</windowtitle> + <bottom><![CDATA[Copyright © ${inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a> All Rights Reserved]]></bottom> + <excludePackageNames>orh.hibernate.tutorial*</excludePackageNames> + <groups> + <group> + <title>Core API</title> + <packages> + org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.mapping:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.stat + </packages> + </group> + <group> + <title>Extension SPI/API</title> + <packages> + org.hibernate.id*:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc:org.hibernate.usertype + </packages> + </group> + <group> + <title>JBoss Cache Integration</title> + <packages>org.hibernate.cache.jbc2*</packages> + </group> + <group> + <title>Miscellaneous API</title> + <packages>org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.tool.instrument*</packages> + </group> + </groups> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-alpha-3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-test-ext-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <goals> + <goal>extend</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-injection-plugin</artifactId> + <version>1.0.2</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>bytecode</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + + <extensions> +  + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav</artifactId> + <version>1.0-beta-2</version> + </extension> +  + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-scm</artifactId> + <version>1.0-beta-6</version> + </extension> + <extension> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-manager-plexus</artifactId> + <version>1.0</version> + </extension> + <extension> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-svnexe</artifactId> + <version>1.0</version> + </extension> + </extensions> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>1.1.1</version> + <configuration> + <onlyAnalyze>org.hibernate.*</onlyAnalyze> + </configuration> + </plugin> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> +  + </dependencies> + + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.6</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.9.0.GA</version> + </dependency> +  + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.2</version> + </dependency> +  + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.0.Final</version> + </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.2.0.Final</version> + </dependency> +  + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.2.GA</version> + </dependency> + </dependencies> + </dependencyManagement> + + <distributionManagement> + <repository> +  +  +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + + <profiles> +  +  +  +  + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> + <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> + <jdbc.url>jdbc:hsqldb:.</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + + <profile> + <id>h2</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.124</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> + <jdbc.driver>org.h2.Driver</jdbc.driver> + <jdbc.url>jdbc:h2:mem:db1</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> + <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://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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/hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>mysql51-cluster</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.8</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru + </jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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:hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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:hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + +  + <profile> + <id>db2v82</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>db2v91</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.8.47</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.8.47</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>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>db2v97</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.86</version> + <scope>test</scope> + </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>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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> + <scope>test</scope> + </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>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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> + <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:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sybase15</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + <scope>test</scope> + </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:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>mssql2005</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://dev30.qa.atl.jboss.com:3918</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</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>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + + </profiles> + + <properties> + <slf4jVersion>1.5.8</slf4jVersion> + </properties> +</project> Modified: core/branches/Branch_3_5/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java *

14 years

1
0
0 / 0

Hibernate SVN: r19254 - in core/trunk: parent and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-04-20 21:56:46 -0400 (Tue, 20 Apr 2010) New Revision: 19254 Modified: core/trunk/entitymanager/pom.xml core/trunk/parent/pom.xml Log: [maven-release-plugin] prepare branch Branch_3_5 Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2010-04-20 16:44:07 UTC (rev 19253) +++ core/trunk/entitymanager/pom.xml 2010-04-21 01:56:46 UTC (rev 19254) @@ -73,7 +73,7 @@ Only really needed for the antrun plugin defined below (which in turn is only really needed to work around a missing feature on the compile plugin; lovely no?). However I have not found a way to declare this dependency local to the antrun plugin and then reference it - from the <javac/>'s <classpath/> :( + from the <javac />'s <classpath /> :( --> <groupId>${project.groupId}</groupId> <artifactId>hibernate-jpamodelgen</artifactId> @@ -125,12 +125,12 @@  <configuration> <tasks> - <property name="target.dir" value="${project.build.directory}/generated-src/jpamodelgen"/> - <property name="src.dir" value="${project.build.testSourceDirectory}"/> - <property name="jdk16_home" value="${jdk16_home}"/> - <property name="classpath" refid="maven.test.classpath"/> + <property name="target.dir" value="${project.build.directory}/generated-src/jpamodelgen" /> + <property name="src.dir" value="${project.build.testSourceDirectory}" /> + <property name="jdk16_home" value="${jdk16_home}" /> + <property name="classpath" refid="maven.test.classpath" /> <ant antfile="${basedir}/build.xml"> - <target name="generate-metamodel"/> + <target name="generate-metamodel" /> </ant> </tasks> </configuration> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-04-20 16:44:07 UTC (rev 19253) +++ core/trunk/parent/pom.xml 2010-04-21 01:56:46 UTC (rev 19254) @@ -54,9 +54,9 @@ </licenses> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection> - <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</developerConnection> + <url>https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5</url> </scm> <ciManagement> @@ -558,8 +558,8 @@ <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> <jdbc.url>jdbc:hsqldb:.</jdbc.url> <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> + <jdbc.pass /> + <jdbc.isolation /> </properties> </profile> @@ -580,8 +580,8 @@ <jdbc.driver>org.h2.Driver</jdbc.driver> <jdbc.url>jdbc:h2:mem:db1</jdbc.url> <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> + <jdbc.pass /> + <jdbc.isolation /> </properties> </profile> <!-- @@ -609,7 +609,7 @@ <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -630,7 +630,7 @@ <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -652,7 +652,7 @@ </jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -673,7 +673,7 @@ <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -694,7 +694,7 @@ <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -726,7 +726,7 @@ <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -752,7 +752,7 @@ <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -778,7 +778,7 @@ <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -800,7 +800,7 @@ <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -822,7 +822,7 @@ <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -843,7 +843,7 @@ <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -866,7 +866,7 @@ </jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile> @@ -887,7 +887,7 @@ <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> + <jdbc.isolation /> </properties> </profile>

14 years

1
0
0 / 0

Hibernate SVN: r19253 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/query/dsl/v2/impl and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2010-04-20 12:44:07 -0400 (Tue, 20 Apr 2010) New Revision: 19253 Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/AllContext.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/FieldContext.java Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryBuilder.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java Log: HSEARCH-509 Add all() query support Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/AllContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/AllContext.java (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/AllContext.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -0,0 +1,16 @@ +package org.hibernate.search.query.dsl.v2; + +import java.util.List; + +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.Query; + +/** + * @author Emmanuel Bernard + */ +public interface AllContext extends QueryCustomization<AllContext>, Termination<AllContext> { + /** + * Exclude the documents matching these queries + */ + AllContext except(Query... queriesMatchingExcludedDocuments); +} Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryBuilder.java 2010-04-20 15:29:43 UTC (rev 19252) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryBuilder.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -1,5 +1,7 @@ package org.hibernate.search.query.dsl.v2; +import org.apache.lucene.search.Query; + /** * @author Emmanuel Bernard */ @@ -27,4 +29,10 @@ * Boolean query */ BooleanJunction<BooleanJunction> bool(); + + /** + * Query matching all documents + * Typically mixed with a boolean query. + */ + AllContext all(); } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-04-20 15:29:43 UTC (rev 19252) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -8,4 +8,9 @@ * text searched in the term query (the term is pre-analyzer unless ignoreAnalyzer is called) */ TermTermination matches(String text); + +// /** +// * field / property the term query is executed on +// */ +// TermMatchingContext onField(String field); } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java 2010-04-20 15:29:43 UTC (rev 19252) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -31,7 +31,7 @@ if ( ! last.getOccur().equals( BooleanClause.Occur.MUST ) ) { throw new AssertionFailure( "Cannot negate class: " + last.getOccur() ); } - clauses.add( lastIndex, new BooleanClause( last.getQuery(), BooleanClause.Occur.MUST_NOT ) ); + clauses.set( lastIndex, new BooleanClause( last.getQuery(), BooleanClause.Occur.MUST_NOT ) ); return this; } @@ -41,7 +41,7 @@ } public MustJunction must(Query query) { - clauses.add( new BooleanClause( query, BooleanClause.Occur.SHOULD ) ); + clauses.add( new BooleanClause( query, BooleanClause.Occur.MUST ) ); return this; } Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -0,0 +1,63 @@ +package org.hibernate.search.query.dsl.v2.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.Filter; +import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.lucene.search.Query; + +import org.hibernate.search.query.dsl.v2.AllContext; + +/** + * @author Emmanuel Bernard + */ +public class ConnectedAllContext implements AllContext { + private final List<BooleanClause> clauses; + private final QueryCustomizer queryCustomizer; + + public ConnectedAllContext() { + this.queryCustomizer = new QueryCustomizer(); + this.clauses = new ArrayList<BooleanClause>(5); + this.clauses.add( new BooleanClause( new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD ) ); + } + + public Query createQuery() { + Query query; + if ( clauses.size() == 1 ) { + query = clauses.get( 0 ).getQuery(); + } + else { + BooleanQuery booleanQuery = new BooleanQuery( ); + for (BooleanClause clause : clauses) { + booleanQuery.add( clause ); + } + query = booleanQuery; + } + return queryCustomizer.setWrappedQuery( query ).createQuery(); + } + + public AllContext except(Query... queriesMatchingExcludedDocuments) { + for (Query query : queriesMatchingExcludedDocuments) { + clauses.add( new BooleanClause( query, BooleanClause.Occur.MUST_NOT ) ); + } + return this; + } + + public AllContext boostedTo(float boost) { + queryCustomizer.boostedTo( boost ); + return this; + } + + public AllContext constantScore() { + queryCustomizer.constantScore(); + return this; + } + + public AllContext filter(Filter filter) { + queryCustomizer.filter( filter ); + return this; + } +} Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java 2010-04-20 15:29:43 UTC (rev 19252) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -3,6 +3,7 @@ import org.apache.lucene.analysis.Analyzer; import org.hibernate.search.SearchFactory; +import org.hibernate.search.query.dsl.v2.AllContext; import org.hibernate.search.query.dsl.v2.BooleanJunction; import org.hibernate.search.query.dsl.v2.FuzzyContext; import org.hibernate.search.query.dsl.v2.QueryBuilder; @@ -39,4 +40,8 @@ public BooleanJunction bool() { return new BooleanQueryBuilder(); } + + public AllContext all() { + return new ConnectedAllContext(); + } } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-04-20 15:29:43 UTC (rev 19252) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -1,5 +1,8 @@ package org.hibernate.search.query.dsl.v2.impl; +import java.util.ArrayList; +import java.util.List; + import org.apache.lucene.analysis.Analyzer; import org.hibernate.search.SearchFactory; @@ -15,19 +18,23 @@ private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private boolean ignoreAnalyzer; - private final QueryContext context; + private final QueryContext queryContext; + private final FieldContext fieldContext; + private final List<ConnectedTermMatchingContext> otherFields; - public ConnectedTermMatchingContext(QueryContext context, + public ConnectedTermMatchingContext(QueryContext queryContext, String field, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, SearchFactory factory) { this.factory = factory; this.field = field; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; - this.context = context; + this.queryContext = queryContext; + this.otherFields = new ArrayList<ConnectedTermMatchingContext>(); + this.fieldContext = null; } public TermTermination matches(String text) { - return new ConnectedSingleTermQueryBuilder(context, ignoreAnalyzer, text, field, queryCustomizer, queryAnalyzer, factory); + return new ConnectedSingleTermQueryBuilder( queryContext, ignoreAnalyzer, text, field, queryCustomizer, queryAnalyzer, factory); } public TermMatchingContext boostedTo(float boost) { Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/FieldContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/FieldContext.java (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/FieldContext.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -0,0 +1,39 @@ +package org.hibernate.search.query.dsl.v2.impl; + +import org.apache.lucene.analysis.Analyzer; + +/** + * @author Emmanuel Bernard + */ +public class FieldContext { + private final String field; + private final Analyzer queryAnalyzer; + private final QueryCustomizer queryCustomizer; + private boolean ignoreAnalyzer; + + public FieldContext(String field, Analyzer queryAnalyzer, QueryCustomizer queryCustomizer) { + this.field = field; + this.queryAnalyzer = queryAnalyzer; + this.queryCustomizer = queryCustomizer; + } + + public String getField() { + return field; + } + + public Analyzer getQueryAnalyzer() { + return queryAnalyzer; + } + + public QueryCustomizer getQueryCustomizer() { + return queryCustomizer; + } + + public boolean isIgnoreAnalyzer() { + return ignoreAnalyzer; + } + + public void setIgnoreAnalyzer(boolean ignoreAnalyzer) { + this.ignoreAnalyzer = ignoreAnalyzer; + } +} Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-04-20 15:29:43 UTC (rev 19252) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-04-20 16:44:07 UTC (rev 19253) @@ -137,7 +137,62 @@ cleanData( fts ); } + public void testBoolean() throws Exception { + FullTextSession fts = initData(); + Transaction transaction = fts.beginTransaction(); + final QueryBuilder monthQb = fts.getSearchFactory() + .buildQueryBuilder().forEntity( Month.class ).get(); + Query + + //must + query = monthQb + .bool() + .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() ) + .createQuery(); + + List<Month> results = fts.createFullTextQuery( query, Month.class ).list(); + assertEquals( 1, results.size() ); + assertEquals( "January", results.get( 0 ).getName() ); + + //must not + all + query = monthQb + .bool() + .should( monthQb.all().createQuery() ) + .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() ) + .not() + .createQuery(); + results = fts.createFullTextQuery( query, Month.class ).list(); + assertEquals( 1, results.size() ); + assertEquals( "February", results.get( 0 ).getName() ); + + //implicit must not + all (not recommended) + query = monthQb + .bool() + .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() ) + .not() + .createQuery(); + results = fts.createFullTextQuery( query, Month.class ).list(); + assertEquals( 1, results.size() ); + assertEquals( "February", results.get( 0 ).getName() ); + + //all except (recommended) + query = monthQb + .all() + .except( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() ) + .createQuery(); + + results = fts.createFullTextQuery( query, Month.class ).list(); + assertEquals( 1, results.size() ); + assertEquals( "February", results.get( 0 ).getName() ); + + + transaction.commit(); + + cleanData( fts ); + } + + // public void testTermQueryOnAnalyzer() throws Exception { // FullTextSession fts = initData(); //

14 years

1
0
0 / 0

Hibernate SVN: r19252 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/engine/messageinterpolation and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2010-04-20 11:29:43 -0400 (Tue, 20 Apr 2010) New Revision: 19252 Added: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_en.properties Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java Log: HV-306 - Falling back to system?\194?\180s default locale if chosen locale was EN Added: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_en.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_en.properties (rev 0) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_en.properties 2010-04-20 15:29:43 UTC (rev 19252) @@ -0,0 +1,9 @@ +# $Id: ValidationMessages_en.properties 19090 2010-03-23 15:22:59Z hardy.ferentschik $ +# This file is intentionally left empty. All calls to this bundle will +# be delegated to the parent bundle ValidationMessages (which contains +# English messages). +# +# Not providing this bundle would cause the bundle for the default +# locale to take precedence over the base bundle. If the default locale +# is not English but one, for which a resource bundle exists (e.g. German), +# the English texts would never be returned. Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties 2010-04-20 15:28:18 UTC (rev 19251) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties 2010-04-20 15:29:43 UTC (rev 19252) @@ -16,4 +16,6 @@ org.hibernate.validator.constraints.Length.message=la taille doit \u00EAtre entre {min} et {max} org.hibernate.validator.constraints.NotBlank.message=ne peut pas \u00EAtre vide org.hibernate.validator.constraints.NotEmpty.message=ne peut pas \u00EAtre vide -org.hibernate.validator.constraints.Range.message=doit \u00EAtre entre {min} et {max} \ No newline at end of file +org.hibernate.validator.constraints.Range.message=doit \u00EAtre entre {min} et {max} +org.hibernate.validator.constraints.URL.message=URL mal form\u00E9e +org.hibernate.validator.constraints.CreditCardNumber.message=Num\u00E9ro de carte de cr\u00E9dit invalide \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java 2010-04-20 15:28:18 UTC (rev 19251) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java 2010-04-20 15:29:43 UTC (rev 19252) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors @@ -29,11 +29,15 @@ import org.hibernate.validator.engine.ResourceBundleMessageInterpolator; import org.hibernate.validator.util.TestUtil; + import static org.hibernate.validator.util.TestUtil.assertCorrectConstraintViolationMessages; import static org.hibernate.validator.util.TestUtil.assertNumberOfViolations; /** + * Tests for correct message interpolation for messages from the default bundle. + * * @author Hardy Ferentschik + * @author Gunnar Morling */ public class MessageInterpolationWithDefaultBundleTest { private Locale defaultLocale; @@ -54,7 +58,7 @@ @Test public void testEmailAndRangeMessageEnglishLocale() { Locale.setDefault( Locale.ENGLISH ); - Configuration config = TestUtil.getConfiguration(); + Configuration<?> config = TestUtil.getConfiguration(); config.messageInterpolator( new ResourceBundleMessageInterpolator() ); Validator validator = config.buildValidatorFactory().getValidator(); User user = new User(); @@ -73,7 +77,7 @@ @Test public void testEmailAndRangeMessageGermanLocale() { Locale.setDefault( Locale.GERMAN ); - Configuration config = TestUtil.getConfiguration(); + Configuration<?> config = TestUtil.getConfiguration(); config.messageInterpolator( new ResourceBundleMessageInterpolator() ); Validator validator = config.buildValidatorFactory().getValidator(); User user = new User(); @@ -92,7 +96,7 @@ @Test public void testEmailAndRangeMessageFrenchLocale() { Locale.setDefault( Locale.FRENCH ); - Configuration config = TestUtil.getConfiguration(); + Configuration<?> config = TestUtil.getConfiguration(); config.messageInterpolator( new ResourceBundleMessageInterpolator() ); Validator validator = config.buildValidatorFactory().getValidator(); User user = new User(); @@ -104,6 +108,45 @@ constraintViolations, "Addresse email mal form\u00E9e", "doit \u00EAtre entre 18 et 21" ); } -} + /** + * HV-306. If English is explicitly set as locale for message interpolation, it + * must take precedence over the system's default locale. + */ + @Test + public void testThatExplicitlySetEnglishLocaleHasPrecedenceOverDefaultLocale() { + Locale.setDefault( Locale.FRENCH ); + Configuration<?> config = TestUtil.getConfiguration(); + config.messageInterpolator( new LocalizedMessageInterpolator( Locale.ENGLISH ) ); + Validator validator = config.buildValidatorFactory().getValidator(); + User user = new User(); + user.setEmail( "foo" ); + user.setAge( 16 ); + Set<ConstraintViolation<User>> constraintViolations = validator.validate( user ); + assertNumberOfViolations( constraintViolations, 2 ); + assertCorrectConstraintViolationMessages( + constraintViolations, "not a well-formed email address", "must be between 18 and 21" + ); + } + + /** + * A message interpolator that enforces one given locale to be used for message + * interpolation. + * + * @author Gunnar Morling + */ + private static class LocalizedMessageInterpolator extends ResourceBundleMessageInterpolator { + + private Locale locale; + + public LocalizedMessageInterpolator(Locale locale) { + this.locale = locale; + } + + @Override + public String interpolate(String messageTemplate, Context context) { + return interpolate( messageTemplate, context, this.locale ); + } + } +}

14 years

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 April 2010