Hibernate SVN: r14701 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 16:55:57 -0400 (Tue, 27 May 2008)
New Revision: 14701
Added:
entitymanager/tags/3.4.0.CR1/
Log:
release entitymanager 3.4.0.CR1
Copied: entitymanager/tags/3.4.0.CR1 (from rev 14700, entitymanager/trunk)
16 years, 6 months
Hibernate SVN: r14700 - annotations/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 16:55:49 -0400 (Tue, 27 May 2008)
New Revision: 14700
Added:
annotations/tags/3.4.0.CR1/
Log:
release annotations 3.4.0.CR1
Copied: annotations/tags/3.4.0.CR1 (from rev 14699, annotations/trunk)
16 years, 6 months
Hibernate SVN: r14699 - commons-annotations/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 16:55:18 -0400 (Tue, 27 May 2008)
New Revision: 14699
Added:
commons-annotations/tags/3.1.0.CR1/
Log:
release commons-annotations 3.1.0.CR1
Copied: commons-annotations/tags/3.1.0.CR1 (from rev 14698, commons-annotations/trunk)
16 years, 6 months
Hibernate SVN: r14698 - in validator/trunk: doc/reference/en and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 16:34:25 -0400 (Tue, 27 May 2008)
New Revision: 14698
Modified:
validator/trunk/build.properties.dist
validator/trunk/build.xml
validator/trunk/changelog.txt
validator/trunk/doc/reference/en/master.xml
validator/trunk/ivy.xml
validator/trunk/ivy/ivyconf.xml
validator/trunk/readme.txt
validator/trunk/src/java/org/hibernate/validator/Version.java
Log:
release validator
Modified: validator/trunk/build.properties.dist
===================================================================
--- validator/trunk/build.properties.dist 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/build.properties.dist 2008-05-27 20:34:25 UTC (rev 14698)
@@ -1,11 +1,3 @@
common.dir=.
src.dir=src
-test.dir=test
-hibernate-core.home=../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=./lib/ejb3-persistence.jar
-jpa.jar=./lib/test/hibernate-entitymanager.jar
-archive-browsing.jar=./lib/test/jboss-archive-browsing.jar
-commons-annotations.jar=./lib/hibernate-commons-annotations.jar
-annotations.jar=./lib/test/hibernate-annotations.jar
\ No newline at end of file
+test.dir=test
\ No newline at end of file
Modified: validator/trunk/build.xml
===================================================================
--- validator/trunk/build.xml 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/build.xml 2008-05-27 20:34:25 UTC (rev 14698)
@@ -25,7 +25,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Validator"/>
<property name="name" value="hibernate-validator"/>
- <property name="version" value="3.0.0.GA"/>
+ <property name="version" value="3.1.0.CR1"/>
<property name="javadoc.packagenames" value="org.hibernate.validator.*"/>
<property name="copy.test" value="true"/>
<property name="javac.source" value="1.5"/>
@@ -266,6 +266,11 @@
<include name="common-build.xml"/>
</fileset>
</copy>
+ <copy todir="${dist.dir}/ivy" failonerror="false">
+ <fileset dir="${ivy.jar.dir}">
+ <include name="**/*.*"/>
+ </fileset>
+ </copy>
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
@@ -288,6 +293,11 @@
<fileset file="${lib.dir}/build/*.jar"/>
</copy>
+ <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation -->
+ <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar"/>
+ <move file="${dist.lib.dir}/test/annotations.jar" tofile="${dist.lib.dir}/test/hibernate-annotations.jar"/>
+ <move file="${dist.lib.dir}/test/entitymanager.jar" tofile="${dist.lib.dir}/test/hibernate-entitymanager.jar"/>
+
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
<antcall target="common-build.dist"/>
Modified: validator/trunk/changelog.txt
===================================================================
--- validator/trunk/changelog.txt 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/changelog.txt 2008-05-27 20:34:25 UTC (rev 14698)
@@ -1,6 +1,26 @@
Hibernate Validator Changelog
=============================
+3.1.0.CR1 (27-05-2008)
+----------------------
+
+** Bug
+ * [HV-14] - Minor typo in regular expression in class EmailValidator
+ * [HV-48] - There is no DefaultValidatorMessage_en leading to no message loaded when locale is explicit and the system default is not en
+
+
+** Improvement
+ * [HV-57] - Move to slf4j
+
+** New Feature
+ * [HV-54] - Add pom
+ * [HV-55] - Make build independent of Hibernate Core structure
+ * [HV-56] - Move to Hibernate Core 3.3
+
+** Patch
+ * [HV-36] - DefaultValidatorMessages_ja.properties
+
+
3.0.0.GA (19-03-2007)
---------------------
Modified: validator/trunk/doc/reference/en/master.xml
===================================================================
--- validator/trunk/doc/reference/en/master.xml 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/doc/reference/en/master.xml 2008-05-27 20:34:25 UTC (rev 14698)
@@ -10,7 +10,7 @@
<subtitle>Reference Guide</subtitle>
- <releaseinfo>3.0.0.GA</releaseinfo>
+ <releaseinfo>3.1.0.CR1</releaseinfo>
<mediaobject>
<imageobject>
Modified: validator/trunk/ivy/ivyconf.xml
===================================================================
--- validator/trunk/ivy/ivyconf.xml 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/ivy/ivyconf.xml 2008-05-27 20:34:25 UTC (rev 14698)
@@ -12,6 +12,9 @@
<ivy pattern="../[module]/target/[revision]/ivy.xml"/>
<artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
+ <filesystem name="maven-local" m2compatible="true">
+ <artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ </filesystem>
<url name="jboss-rep-maven-regular" m2compatible="true">
<artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[ar..."/>
</url>
Modified: validator/trunk/ivy.xml
===================================================================
--- validator/trunk/ivy.xml 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/ivy.xml 2008-05-27 20:34:25 UTC (rev 14698)
@@ -14,7 +14,7 @@
<dependencies>
<!-- compile time dependencies -->
<dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
- <dependency name="commons-annotations" rev="latest" conf="default->default"/>
+ <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/>
<dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR1" conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/>
@@ -24,13 +24,14 @@
<dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/>
<!-- test deps -->
- <dependency name="annotations" rev="latest" conf="test->default"/>
- <dependency name="entitymanager" rev="latest" conf="test->default"/>
+ <dependency name="annotations" rev="3.4.0.CR1" conf="test->default"/>
+ <dependency name="entitymanager" rev="3.4.0.CR1" conf="test->default"/>
<dependency org="cglib" name="cglib" rev="2.1_3" conf="test->default"/>
<dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/>
<dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/>
<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/>
<dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
+ <dependency org="javax.transaction" name="jta" rev="1.1" conf="test->default"/>
</dependencies>
</ivy-module>
\ No newline at end of file
Modified: validator/trunk/readme.txt
===================================================================
--- validator/trunk/readme.txt 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/readme.txt 2008-05-27 20:34:25 UTC (rev 14698)
@@ -1,6 +1,6 @@
Hibernate Validator
==================================================
-Version: 3.0.0.GA, 19.03.2007
+Version: 3.1.0.CR1, 27.05.2008
Description
-----------
Modified: validator/trunk/src/java/org/hibernate/validator/Version.java
===================================================================
--- validator/trunk/src/java/org/hibernate/validator/Version.java 2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/src/java/org/hibernate/validator/Version.java 2008-05-27 20:34:25 UTC (rev 14698)
@@ -10,7 +10,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.0.0.GA";
+ public static final String VERSION = "3.1.0.CR1";
private static Logger log = LoggerFactory.getLogger( Version.class );
static {
16 years, 6 months
Hibernate SVN: r14697 - in entitymanager/trunk: doc/reference/en and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 16:01:00 -0400 (Tue, 27 May 2008)
New Revision: 14697
Modified:
entitymanager/trunk/build.properties.dist
entitymanager/trunk/build.xml
entitymanager/trunk/changelog.txt
entitymanager/trunk/doc/reference/en/master.xml
entitymanager/trunk/ivy.xml
entitymanager/trunk/ivy/ivyconf.xml
entitymanager/trunk/readme.txt
entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
Log:
release entitymanager
Modified: entitymanager/trunk/build.properties.dist
===================================================================
--- entitymanager/trunk/build.properties.dist 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/build.properties.dist 2008-05-27 20:01:00 UTC (rev 14697)
@@ -2,11 +2,4 @@
src.dir=src
test.dir=test
resources.dir=resources
-testresources.dir=test-resources
-hibernate-core.home=../hibernate-3.2
-
-
-#locally present jars
-jpa-api.jar=./lib/ejb3-persistence.jar
-commons-annotations.jar=./lib/hibernate-commons-annotations.jar
-annotations.jar=./lib/hibernate-annotations.jar
\ No newline at end of file
+testresources.dir=test-resources
\ No newline at end of file
Modified: entitymanager/trunk/build.xml
===================================================================
--- entitymanager/trunk/build.xml 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/build.xml 2008-05-27 20:01:00 UTC (rev 14697)
@@ -416,6 +416,11 @@
<fileset file="${lib.dir}/build/*.jar"/>
</copy>
+ <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation -->
+ <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar"/>
+ <move file="${dist.lib.dir}/annotations.jar" tofile="${dist.lib.dir}/hibernate-annotations.jar"/>
+
+
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
<antcall target="common-build.dist"/>
Modified: entitymanager/trunk/changelog.txt
===================================================================
--- entitymanager/trunk/changelog.txt 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/changelog.txt 2008-05-27 20:01:00 UTC (rev 14697)
@@ -1,6 +1,18 @@
Hibernate EntityManager Changelog
==================================
+3.4.0.CR1 (27-05-2008)
+----------------------
+
+** Improvement
+ * [EJB-359] - Move to slf4j
+
+** New Feature
+ * [EJB-352] - Add pom
+ * [EJB-353] - Make build independent of Hibernate Core structure
+ * [EJB-354] - Move to Hibernate Core 3.3
+
+
3.3.2.GA (14-03-2008)
---------------------
Modified: entitymanager/trunk/doc/reference/en/master.xml
===================================================================
--- entitymanager/trunk/doc/reference/en/master.xml 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/doc/reference/en/master.xml 2008-05-27 20:01:00 UTC (rev 14697)
@@ -16,7 +16,7 @@
<subtitle>User guide</subtitle>
- <releaseinfo>3.3.2.GA</releaseinfo>
+ <releaseinfo>3.4.0.CR1</releaseinfo>
<mediaobject>
<imageobject>
Modified: entitymanager/trunk/ivy/ivyconf.xml
===================================================================
--- entitymanager/trunk/ivy/ivyconf.xml 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/ivy/ivyconf.xml 2008-05-27 20:01:00 UTC (rev 14697)
@@ -12,6 +12,9 @@
<ivy pattern="../[module]/target/[revision]/ivy.xml"/>
<artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
+ <filesystem name="maven-local" m2compatible="true">
+ <artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ </filesystem>
<url name="jboss-rep-maven-regular" m2compatible="true">
<artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[ar..."/>
</url>
Modified: entitymanager/trunk/ivy.xml
===================================================================
--- entitymanager/trunk/ivy.xml 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/ivy.xml 2008-05-27 20:01:00 UTC (rev 14697)
@@ -14,8 +14,8 @@
<dependencies>
<!-- compile time dependencies -->
<dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
- <dependency name="commons-annotations" rev="latest" conf="default->default"/>
- <dependency name="annotations" rev="latest" conf="default->default"/>
+ <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/>
+ <dependency name="annotations" rev="3.4.0.CR1" conf="default->default"/>
<dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR1" conf="default->default"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/>
<dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/>
Modified: entitymanager/trunk/readme.txt
===================================================================
--- entitymanager/trunk/readme.txt 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/readme.txt 2008-05-27 20:01:00 UTC (rev 14697)
@@ -1,8 +1,8 @@
Hibernate EntityManager
==================================================
-Version: 3.3.2.GA, 14.03.2008
+Version: 3.4.0.CR1, 27.05.2008
-THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.GA (and above)
+THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.3 (and above)
Description
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-05-27 20:01:00 UTC (rev 14697)
@@ -9,7 +9,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.3.2.GA";
+ public static final String VERSION = "3.4.0.CR1";
private static final Logger log = LoggerFactory.getLogger( Version.class );
static {
16 years, 6 months
Hibernate SVN: r14696 - in annotations/trunk: doc/reference/en and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 15:18:16 -0400 (Tue, 27 May 2008)
New Revision: 14696
Modified:
annotations/trunk/build.properties.dist
annotations/trunk/build.xml
annotations/trunk/changelog.txt
annotations/trunk/doc/reference/en/master.xml
annotations/trunk/doc/reference/en/modules/setup.xml
annotations/trunk/ivy.xml
annotations/trunk/ivy/ivyconf.xml
annotations/trunk/pom.xml
annotations/trunk/readme.txt
annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java
Log:
release annotations
Modified: annotations/trunk/build.properties.dist
===================================================================
--- annotations/trunk/build.properties.dist 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/build.properties.dist 2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,8 +1,3 @@
common.dir=.
src.dir=src
test.dir=test
-hibernate-core.home=../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=./lib/ejb3-persistence.jar
-commons-annotations.jar=./lib/hibernate-commons-annotations.jar
\ No newline at end of file
Modified: annotations/trunk/build.xml
===================================================================
--- annotations/trunk/build.xml 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/build.xml 2008-05-27 19:18:16 UTC (rev 14696)
@@ -273,6 +273,9 @@
<fileset file="${lib.dir}/build/*.jar"/>
</copy>
+ <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation -->
+ <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar"/>
+
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
<antcall target="common-build.dist"/>
Modified: annotations/trunk/changelog.txt
===================================================================
--- annotations/trunk/changelog.txt 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/changelog.txt 2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,6 +1,19 @@
Hibernate Annotations Changelog
===============================
+3.4.0.CR1 (27-05-2008)
+----------------------
+
+** Improvement
+ * [ANN-741] - Move to slf4j
+
+** New Feature
+ * [ANN-713] - Use an ant task to deploy the maven artifacts
+ * [ANN-736] - Add pom
+ * [ANN-737] - Make build independent of Hibernate Core structure
+ * [ANN-738] - Move to Hibernate Core 3.3
+
+
3.3.1.GA (14-03-2008)
---------------------
Modified: annotations/trunk/doc/reference/en/master.xml
===================================================================
--- annotations/trunk/doc/reference/en/master.xml 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/doc/reference/en/master.xml 2008-05-27 19:18:16 UTC (rev 14696)
@@ -12,7 +12,7 @@
<subtitle>Reference Guide</subtitle>
- <releaseinfo>3.3.1.GA</releaseinfo>
+ <releaseinfo>3.4.0.CR1</releaseinfo>
<mediaobject>
<imageobject>
Modified: annotations/trunk/doc/reference/en/modules/setup.xml
===================================================================
--- annotations/trunk/doc/reference/en/modules/setup.xml 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/doc/reference/en/modules/setup.xml 2008-05-27 19:18:16 UTC (rev 14696)
@@ -12,12 +12,11 @@
</listitem>
<listitem>
- <para><emphasis>This release requires Hibernate Core 3.2.0.GA and above.</emphasis></para>
+ <para><emphasis>This release requires Hibernate Core 3.3 and above.</emphasis></para>
</listitem>
<listitem>
- <para>This release is known to work on Hibernate Core 3.2.0 up to
- 3.2.2.GA</para>
+ <para>This release is known to work on Hibernate Core 3.3.CR1</para>
</listitem>
<listitem>
Modified: annotations/trunk/ivy/ivyconf.xml
===================================================================
--- annotations/trunk/ivy/ivyconf.xml 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/ivy/ivyconf.xml 2008-05-27 19:18:16 UTC (rev 14696)
@@ -12,6 +12,9 @@
<ivy pattern="../[module]/target/[revision]/ivy.xml"/>
<artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
+ <filesystem name="maven-local" m2compatible="true">
+ <artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ </filesystem>
<url name="jboss-rep-maven-regular" m2compatible="true">
<artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[ar..."/>
</url>
Modified: annotations/trunk/ivy.xml
===================================================================
--- annotations/trunk/ivy.xml 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/ivy.xml 2008-05-27 19:18:16 UTC (rev 14696)
@@ -14,7 +14,7 @@
<dependencies>
<!-- compile time dependencies -->
<dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
- <dependency name="commons-annotations" rev="latest" conf="default->default"/>
+ <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/>
<dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR1" conf="default->default"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/>
Modified: annotations/trunk/pom.xml
===================================================================
--- annotations/trunk/pom.xml 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/pom.xml 2008-05-27 19:18:16 UTC (rev 14696)
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>hibernate-core</artifactId>
<version>3.3.0.CR1</version>
</dependency>
<dependency>
Modified: annotations/trunk/readme.txt
===================================================================
--- annotations/trunk/readme.txt 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/readme.txt 2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,8 +1,8 @@
Hibernate Annotations
==================================================
-Version: 3.3.1.GA, 14.03.2008
+Version: 3.4.0.CR1, 27.05.2008
-THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.2.0.GA (and above)
+THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.3 (and above)
Description
-----------
Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java
===================================================================
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java 2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java 2008-05-27 19:18:16 UTC (rev 14696)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.3.1.GA";
+ public static final String VERSION = "3.4.0.CR1";
private static Logger log = LoggerFactory.getLogger( Version.class );
static {
16 years, 6 months
Hibernate SVN: r14695 - commons-annotations/trunk/ivy.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 15:09:55 -0400 (Tue, 27 May 2008)
New Revision: 14695
Modified:
commons-annotations/trunk/ivy/ivyconf.xml
Log:
merge back local maven repos
Modified: commons-annotations/trunk/ivy/ivyconf.xml
===================================================================
--- commons-annotations/trunk/ivy/ivyconf.xml 2008-05-27 18:59:15 UTC (rev 14694)
+++ commons-annotations/trunk/ivy/ivyconf.xml 2008-05-27 19:09:55 UTC (rev 14695)
@@ -13,7 +13,7 @@
<artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
<filesystem name="maven-local" m2compatible="true">
- <artifact pattern="${maven.local.repo}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ <artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
</filesystem>
<url name="jboss-rep-maven-regular" m2compatible="true">
<artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[ar..."/>
16 years, 6 months
Hibernate SVN: r14694 - commons-annotations/trunk.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 14:59:15 -0400 (Tue, 27 May 2008)
New Revision: 14694
Added:
commons-annotations/trunk/build.properties.dist
Modified:
commons-annotations/trunk/build.xml
Log:
add ability to run tests in dist
Added: commons-annotations/trunk/build.properties.dist
===================================================================
--- commons-annotations/trunk/build.properties.dist (rev 0)
+++ commons-annotations/trunk/build.properties.dist 2008-05-27 18:59:15 UTC (rev 14694)
@@ -0,0 +1,3 @@
+common.dir=.
+src.dir=src
+test.dir=test
Modified: commons-annotations/trunk/build.xml
===================================================================
--- commons-annotations/trunk/build.xml 2008-05-27 18:37:22 UTC (rev 14693)
+++ commons-annotations/trunk/build.xml 2008-05-27 18:59:15 UTC (rev 14694)
@@ -186,7 +186,16 @@
<copy todir="${dist.lib.dir}/build" failonerror="false">
<fileset file="${lib.dir}/build/*.jar"/>
</copy>
+
+ <copy todir="${dist.dir}/ivy" failonerror="false">
+ <fileset dir="${ivy.jar.dir}">
+ <include name="**/*.*"/>
+ </fileset>
+ </copy>
+ <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
+ </copy>
+
<antcall target="common-build.dist"/>
</target>
16 years, 6 months
Hibernate SVN: r14693 - in commons-annotations/trunk: ivy and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-05-27 14:37:22 -0400 (Tue, 27 May 2008)
New Revision: 14693
Added:
commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java
Modified:
commons-annotations/trunk/changelog.txt
commons-annotations/trunk/ivy/ivyconf.xml
commons-annotations/trunk/lib/README.txt
commons-annotations/trunk/readme.txt
commons-annotations/trunk/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java
Log:
Release
Modified: commons-annotations/trunk/changelog.txt
===================================================================
--- commons-annotations/trunk/changelog.txt 2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/changelog.txt 2008-05-27 18:37:22 UTC (rev 14693)
@@ -1,6 +1,14 @@
Hibernate Annotations Changelog
===============================
+3.1.0.CR1 (27-05-2008)
+----------------------
+
+** New Feature
+ * [HCANN-1] - Move to slf4j
+ * [HCANN-2] - Add POM
+ * [HCANN-3] - Make build independent of Hibernate Core structure
+
3.0.0.GA (19-03-2007)
---------------------
Modified: commons-annotations/trunk/ivy/ivyconf.xml
===================================================================
--- commons-annotations/trunk/ivy/ivyconf.xml 2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/ivy/ivyconf.xml 2008-05-27 18:37:22 UTC (rev 14693)
@@ -12,6 +12,9 @@
<ivy pattern="../[module]/target/[revision]/ivy.xml"/>
<artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
+ <filesystem name="maven-local" m2compatible="true">
+ <artifact pattern="${maven.local.repo}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ </filesystem>
<url name="jboss-rep-maven-regular" m2compatible="true">
<artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[ar..."/>
</url>
Modified: commons-annotations/trunk/lib/README.txt
===================================================================
--- commons-annotations/trunk/lib/README.txt 2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/lib/README.txt 2008-05-27 18:37:22 UTC (rev 14693)
@@ -3,9 +3,10 @@
Core
====
-commons-logging.jar (see Hibernate Core version): required
-log4j.jar (see Hibernate Core version): optional
+slf4j-api.jar (see Hibernate Core version): required
+slf4j-*.jar (eg. slf4j-log4j12): required
+Your favorite logging framework: required
Test
====
-ejb3-persistence.jar (final release version): required
\ No newline at end of file
+ejb3-persistence.jar (1.0.2): required
\ No newline at end of file
Modified: commons-annotations/trunk/readme.txt
===================================================================
--- commons-annotations/trunk/readme.txt 2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/readme.txt 2008-05-27 18:37:22 UTC (rev 14693)
@@ -1,6 +1,6 @@
Hibernate Commons Annotations
==================================================
-Version: 3.0.0.GA, 19.03.2007
+Version: 3.1.0.CR1, 27.05.2008
Description
-----------
Added: commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java
===================================================================
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java (rev 0)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java 2008-05-27 18:37:22 UTC (rev 14693)
@@ -0,0 +1,19 @@
+package org.hibernate.annotations.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Version {
+ public static final String VERSION = "3.1.0.CR1";
+ private static Logger log = LoggerFactory.getLogger( Version.class );
+
+ static {
+ log.info( "Hibernate Commons Annotations {}", VERSION );
+ }
+
+ public static void touch() {
+ }
+}
Modified: commons-annotations/trunk/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java
===================================================================
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java 2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java 2008-05-27 18:37:22 UTC (rev 14693)
@@ -20,6 +20,7 @@
import org.hibernate.annotations.common.reflection.java.generics.TypeSwitch;
import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.Version;
/**
* The factory for all the objects in this package.
@@ -30,7 +31,11 @@
*/
public class JavaReflectionManager implements ReflectionManager {
- private static class TypeKey extends Pair<Type, TypeEnvironment> {
+ static {
+ Version.touch();
+ }
+
+ private static class TypeKey extends Pair<Type, TypeEnvironment> {
TypeKey(Type t, TypeEnvironment context) {
super( t, context );
}
16 years, 6 months
Hibernate SVN: r14692 - in search/trunk/src: java/org/hibernate/search/engine and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2008-05-27 13:43:29 -0400 (Tue, 27 May 2008)
New Revision: 14692
Modified:
search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java
Log:
typo in SearchFactoryImplementor interface; some trivial code cleanups.
Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -115,7 +115,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void load(InputStream inStream) throws IOException {
+ public void load(InputStream inStream) throws IOException {
throw new UnsupportedOperationException();
}
@@ -123,7 +123,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void loadFromXML(InputStream in) throws IOException,
+ public void loadFromXML(InputStream in) throws IOException,
InvalidPropertiesFormatException {
throw new UnsupportedOperationException();
}
@@ -140,7 +140,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void save(OutputStream out, String comments) {
+ public void save(OutputStream out, String comments) {
throw new UnsupportedOperationException();
}
@@ -148,7 +148,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object setProperty(String key, String value) {
+ public Object setProperty(String key, String value) {
throw new UnsupportedOperationException();
}
@@ -156,7 +156,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void store(OutputStream out, String comments)
+ public void store(OutputStream out, String comments)
throws IOException {
throw new UnsupportedOperationException();
}
@@ -165,7 +165,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void storeToXML(OutputStream os, String comment,
+ public void storeToXML(OutputStream os, String comment,
String encoding) throws IOException {
throw new UnsupportedOperationException();
}
@@ -174,7 +174,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void storeToXML(OutputStream os, String comment)
+ public void storeToXML(OutputStream os, String comment)
throws IOException {
throw new UnsupportedOperationException();
}
@@ -183,7 +183,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void clear() {
+ public void clear() {
throw new UnsupportedOperationException();
}
@@ -191,7 +191,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object clone() {
+ public Object clone() {
throw new UnsupportedOperationException();
}
@@ -199,7 +199,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized boolean contains(Object value) {
+ public boolean contains(Object value) {
throw new UnsupportedOperationException();
}
@@ -215,7 +215,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Enumeration<Object> elements() {
+ public Enumeration<Object> elements() {
throw new UnsupportedOperationException();
}
@@ -231,12 +231,12 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object get(Object key) {
+ public Object get(Object key) {
throw new UnsupportedOperationException();
}
@Override
- public synchronized boolean isEmpty() {
+ public boolean isEmpty() {
if ( fallBack==null ) {
return masked.isEmpty();
}
@@ -249,7 +249,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Enumeration<Object> keys() {
+ public Enumeration<Object> keys() {
throw new UnsupportedOperationException();
}
@@ -265,7 +265,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object put(Object key, Object value) {
+ public Object put(Object key, Object value) {
throw new UnsupportedOperationException();
}
@@ -273,7 +273,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized void putAll(Map<? extends Object, ? extends Object> t) {
+ public void putAll(Map<? extends Object, ? extends Object> t) {
throw new UnsupportedOperationException();
}
@@ -289,7 +289,7 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized Object remove(Object key) {
+ public Object remove(Object key) {
throw new UnsupportedOperationException();
}
@@ -297,12 +297,12 @@
* @throws UnsupportedOperationException
*/
@Override
- public synchronized int size() {
+ public int size() {
throw new UnsupportedOperationException();
}
@Override
- public synchronized String toString() {
+ public String toString() {
return masked.toString();
}
@@ -327,6 +327,8 @@
public boolean equals(Object obj) {
if ( this == obj )
return true;
+ if ( obj == null )
+ return false;
if ( getClass() != obj.getClass() )
return false;
final MaskedProperty other = (MaskedProperty) obj;
Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -39,8 +39,7 @@
public LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?> provider);
- //FIXME spelling error in method name:
- void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams);
+ void addIndexingParameters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams);
public String getIndexingStrategy();
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -230,7 +230,7 @@
dirProviderOptimizerStrategies.put( provider, optimizerStrategy );
}
- public void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams) {
+ public void addIndexingParameters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams) {
dirProviderIndexingParams.put( provider, indexingParams );
}
Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -181,7 +181,7 @@
private void configureIndexingParameters(SearchFactoryImplementor searchFactoryImplementor,
Properties directoryProperties, DirectoryProvider<?> provider) {
LuceneIndexingParameters indexingParams = new LuceneIndexingParameters( directoryProperties );
- searchFactoryImplementor.addIndexingParmeters( provider, indexingParams );
+ searchFactoryImplementor.addIndexingParameters( provider, indexingParams );
}
/**
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java 2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBridge.java 2008-05-27 17:43:29 UTC (rev 14692)
@@ -1,15 +1,10 @@
//$Id$
package org.hibernate.search.test.bridge;
-import java.util.Arrays;
import java.util.Map;
-import java.util.HashMap;
-import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.ParameterizedBridge;
import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.search.annotations.FieldBridge;
-import org.hibernate.annotations.Parameter;
/**
* Padding Integer bridge.
@@ -19,7 +14,7 @@
*/
public class PaddedIntegerBridge implements TwoWayStringBridge, ParameterizedBridge {
- public static String PADDING_PROPERTY = "padding";
+ public static final String PADDING_PROPERTY = "padding";
private int padding = 5; //default
16 years, 6 months