Hibernate SVN: r15112 - search/trunk/src/test/org/hibernate/search/test/id/providedId.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-08-19 09:20:54 -0400 (Tue, 19 Aug 2008)
New Revision: 15112
Modified:
search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
Log:
style
Modified: search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java 2008-08-19 10:16:17 UTC (rev 15111)
+++ search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java 2008-08-19 13:20:54 UTC (rev 15112)
@@ -10,54 +10,47 @@
/**
- @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani(a)redhat.com</a>)
+ * @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani(a)redhat.com</a>)
*/
@Entity
@ProvidedId(bridge = @FieldBridge(impl = LongBridge.class))
@Indexed
-public class ProvidedIdPerson implements Serializable
-{
+public class ProvidedIdPerson implements Serializable {
- @Id
- @GeneratedValue
- private long id;
+ @Id
+ @GeneratedValue
+ private long id;
- @Field (index = Index.TOKENIZED, store = Store.YES)
- private String name;
- @Field (index = Index.TOKENIZED, store = Store.YES)
- private String blurb;
- @Field (index = Index.UN_TOKENIZED, store = Store.YES)
- private int age;
+ @Field(index = Index.TOKENIZED, store = Store.YES)
+ private String name;
+ @Field(index = Index.TOKENIZED, store = Store.YES)
+ private String blurb;
+ @Field(index = Index.UN_TOKENIZED, store = Store.YES)
+ private int age;
- public String getName()
- {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name)
- {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public String getBlurb()
- {
- return blurb;
- }
+ public String getBlurb() {
+ return blurb;
+ }
- public void setBlurb(String blurb)
- {
- this.blurb = blurb;
- }
+ public void setBlurb(String blurb) {
+ this.blurb = blurb;
+ }
- public int getAge()
- {
- return age;
- }
+ public int getAge() {
+ return age;
+ }
- public void setAge(int age)
- {
- this.age = age;
- }
+ public void setAge(int age) {
+ this.age = age;
+ }
}
15 years, 9 months
Hibernate SVN: r15111 - in validator/trunk/src: test/org/hibernate/validator/test and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-08-19 06:16:17 -0400 (Tue, 19 Aug 2008)
New Revision: 15111
Added:
validator/trunk/src/test/org/hibernate/validator/test/AssertTest.java
Modified:
validator/trunk/src/java/org/hibernate/validator/AssertFalseValidator.java
validator/trunk/src/java/org/hibernate/validator/AssertTrueValidator.java
Log:
HV-53 Updated implementation of AssertFalseValidator and AssertTrueValidator
Modified: validator/trunk/src/java/org/hibernate/validator/AssertFalseValidator.java
===================================================================
--- validator/trunk/src/java/org/hibernate/validator/AssertFalseValidator.java 2008-08-19 02:51:06 UTC (rev 15110)
+++ validator/trunk/src/java/org/hibernate/validator/AssertFalseValidator.java 2008-08-19 10:16:17 UTC (rev 15111)
@@ -8,14 +8,19 @@
* Check if a given object is false or not
*
* @author Gavin King
+ * @author Hardy Ferentschik
*/
public class AssertFalseValidator implements Validator<AssertFalse>, Serializable {
- public boolean isValid(Object value) {
- return !(Boolean) value;
- }
+ public boolean isValid(Object value) {
+ if (value == null) return true;
+ if (value instanceof Boolean) {
+ return !(Boolean) value;
+ }
+ return false;
+ }
- public void initialize(AssertFalse parameters) {
- }
+ public void initialize(AssertFalse parameters) {
+ }
}
Modified: validator/trunk/src/java/org/hibernate/validator/AssertTrueValidator.java
===================================================================
--- validator/trunk/src/java/org/hibernate/validator/AssertTrueValidator.java 2008-08-19 02:51:06 UTC (rev 15110)
+++ validator/trunk/src/java/org/hibernate/validator/AssertTrueValidator.java 2008-08-19 10:16:17 UTC (rev 15111)
@@ -5,17 +5,22 @@
/**
- * Check whether an element is true or not
+ * Check whether an element is true or not.
*
* @author Gavin King
+ * @author Hardy Ferentschik
*/
public class AssertTrueValidator implements Validator<AssertTrue>, Serializable {
- public boolean isValid(Object value) {
- return (Boolean) value;
- }
+ public boolean isValid(Object value) {
+ if (value == null) return true;
+ if (value instanceof Boolean) {
+ return (Boolean) value;
+ }
+ return false;
+ }
- public void initialize(AssertTrue parameters) {
- }
+ public void initialize(AssertTrue parameters) {
+ }
}
Added: validator/trunk/src/test/org/hibernate/validator/test/AssertTest.java
===================================================================
--- validator/trunk/src/test/org/hibernate/validator/test/AssertTest.java (rev 0)
+++ validator/trunk/src/test/org/hibernate/validator/test/AssertTest.java 2008-08-19 10:16:17 UTC (rev 15111)
@@ -0,0 +1,59 @@
+// $Id$
+package org.hibernate.validator.test;
+
+import junit.framework.TestCase;
+import org.hibernate.validator.ClassValidator;
+import org.hibernate.validator.InvalidValue;
+import org.hibernate.validator.AssertTrueValidator;
+import org.hibernate.validator.AssertFalseValidator;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * Test cases for <code>AssertFalse</code> and <code>AssertTrue</code>.
+ *
+ * @author Hardy Ferentschik
+ * @see HV-53
+ */
+public class AssertTest extends TestCase {
+ ClassValidator<BooleanHolder> classValidator;
+
+ public void setUp() throws Exception {
+ classValidator = new ClassValidator<BooleanHolder>(
+ BooleanHolder.class, ResourceBundle.getBundle("messages", Locale.ENGLISH)
+ );
+ }
+
+ public void testSuccessfulValidation() throws Exception {
+ BooleanHolder bholder = new BooleanHolder();
+ bholder.setMustBeTrue(true);
+ bholder.setMustBeFalse(false);
+ InvalidValue[] invalidValues = classValidator.getInvalidValues(bholder);
+ assertTrue("should be empty", invalidValues.length == 0);
+ }
+
+ public void testUnSuccessfulValidation() throws Exception {
+ BooleanHolder bholder = new BooleanHolder();
+ bholder.setMustBeTrue(false);
+ bholder.setMustBeFalse(true);
+ InvalidValue[] invalidValues = classValidator.getInvalidValues(bholder);
+ assertTrue("should be empty", invalidValues.length == 2);
+ }
+
+ public void testNullValidation() throws Exception {
+ BooleanHolder bholder = new BooleanHolder();
+ bholder.setMustBeTrue(null);
+ bholder.setMustBeFalse(null);
+ InvalidValue[] invalidValues = classValidator.getInvalidValues(bholder);
+ assertTrue("should be empty", invalidValues.length == 0);
+ }
+
+ public void testNonBooleanValidation() throws Exception {
+ AssertTrueValidator trueValidator = new AssertTrueValidator();
+ assertFalse(trueValidator.isValid("foo"));
+
+ AssertFalseValidator falseValidator = new AssertFalseValidator();
+ assertFalse(falseValidator.isValid("foo"));
+ }
+}
\ No newline at end of file
Property changes on: validator/trunk/src/test/org/hibernate/validator/test/AssertTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
15 years, 9 months
Hibernate SVN: r15110 - core/trunk/core/src/main/java/org/hibernate/impl.
by hibernate-commits＠lists.jboss.org
Author: cbredesen
Date: 2008-08-18 22:51:06 -0400 (Mon, 18 Aug 2008)
New Revision: 15110
Modified:
core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
Log:
HHH-2694 moved schemaExport.drop() before connectionProvider.close()
Modified: core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2008-08-19 02:40:39 UTC (rev 15109)
+++ core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2008-08-19 02:51:06 UTC (rev 15110)
@@ -878,6 +878,10 @@
settings.getRegionFactory().stop();
+ if ( settings.isAutoDropSchema() ) {
+ schemaExport.drop( false, true );
+ }
+
try {
settings.getConnectionProvider().close();
}
@@ -885,10 +889,6 @@
SessionFactoryObjectFactory.removeInstance(uuid, name, properties);
}
- if ( settings.isAutoDropSchema() ) {
- schemaExport.drop( false, true );
- }
-
observer.sessionFactoryClosed( this );
eventListeners.destroyListeners();
}
15 years, 9 months
Hibernate SVN: r15109 - core/branches/Branch_3_3/core/src/main/java/org/hibernate/impl.
by hibernate-commits＠lists.jboss.org
Author: cbredesen
Date: 2008-08-18 22:40:39 -0400 (Mon, 18 Aug 2008)
New Revision: 15109
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
Log:
HHH-2694 moved schemaExport.drop() before connectionProvider.close()
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2008-08-18 19:27:15 UTC (rev 15108)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2008-08-19 02:40:39 UTC (rev 15109)
@@ -835,6 +835,10 @@
settings.getRegionFactory().stop();
+ if ( settings.isAutoDropSchema() ) {
+ schemaExport.drop( false, true );
+ }
+
try {
settings.getConnectionProvider().close();
}
@@ -842,10 +846,6 @@
SessionFactoryObjectFactory.removeInstance(uuid, name, properties);
}
- if ( settings.isAutoDropSchema() ) {
- schemaExport.drop( false, true );
- }
-
observer.sessionFactoryClosed( this );
eventListeners.destroyListeners();
}
15 years, 9 months
Hibernate SVN: r15108 - core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-08-18 15:27:15 -0400 (Mon, 18 Aug 2008)
New Revision: 15108
Modified:
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/UnitTestCase.java
Log:
fixed validation of failure expected results
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/UnitTestCase.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:24:24 UTC (rev 15107)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:27:15 UTC (rev 15108)
@@ -33,9 +33,12 @@
log.info( "Starting test [" + fullTestName() + "]" );
super.runBare();
if ( doValidate ) {
- fail( "Test marked as FailureExpected, but did not fail!" );
+ throw new FailureExpectedTestPassedException();
}
}
+ catch ( FailureExpectedTestPassedException t ) {
+ throw t;
+ }
catch( Throwable t ) {
if ( doValidate ) {
skipExpectedFailure( t );
@@ -49,6 +52,12 @@
}
}
+ private static class FailureExpectedTestPassedException extends Exception {
+ public FailureExpectedTestPassedException() {
+ super( "Test marked as FailureExpected, but did not fail!" );
+ }
+ }
+
protected void skipExpectedFailure(Throwable error) {
reportSkip( "ignoring *FailuredExpected methods", "Failed with: " + error.toString() );
}
15 years, 9 months
Hibernate SVN: r15107 - core/branches/Branch_3_3/testing/src/main/java/org/hibernate/junit.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-08-18 15:24:24 -0400 (Mon, 18 Aug 2008)
New Revision: 15107
Modified:
core/branches/Branch_3_3/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
Log:
fixed validation of failure expected results
Modified: core/branches/Branch_3_3/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
===================================================================
--- core/branches/Branch_3_3/testing/src/main/java/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:22:41 UTC (rev 15106)
+++ core/branches/Branch_3_3/testing/src/main/java/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:24:24 UTC (rev 15107)
@@ -62,9 +62,12 @@
log.info( "Starting test [" + fullTestName() + "]" );
super.runBare();
if ( doValidate ) {
- fail( "Test marked as FailureExpected, but did not fail!" );
+ throw new FailureExpectedTestPassedException();
}
}
+ catch ( FailureExpectedTestPassedException t ) {
+ throw t;
+ }
catch( Throwable t ) {
if ( doValidate ) {
skipExpectedFailure( t );
@@ -78,6 +81,12 @@
}
}
+ private static class FailureExpectedTestPassedException extends Exception {
+ public FailureExpectedTestPassedException() {
+ super( "Test marked as FailureExpected, but did not fail!" );
+ }
+ }
+
protected void skipExpectedFailure(Throwable error) {
reportSkip( "ignoring *FailuredExpected methods", "Failed with: " + error.toString() );
}
15 years, 9 months
Hibernate SVN: r15106 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-08-18 15:22:41 -0400 (Mon, 18 Aug 2008)
New Revision: 15106
Added:
entitymanager/tags/3.4.0.GA/
Log:
Created tag 3.4.0.GA.
Copied: entitymanager/tags/3.4.0.GA (from rev 15105, entitymanager/trunk)
15 years, 9 months
Hibernate SVN: r15105 - in entitymanager/trunk: doc/reference/en and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-08-18 15:20:37 -0400 (Mon, 18 Aug 2008)
New Revision: 15105
Modified:
entitymanager/trunk/build.xml
entitymanager/trunk/changelog.txt
entitymanager/trunk/common-build.xml
entitymanager/trunk/doc/reference/en/master.xml
entitymanager/trunk/ivy.xml
entitymanager/trunk/pom.xml
entitymanager/trunk/readme.txt
entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
Log:
Updated all files for 3.4.0.GA release
Modified: entitymanager/trunk/build.xml
===================================================================
--- entitymanager/trunk/build.xml 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/build.xml 2008-08-18 19:20:37 UTC (rev 15105)
@@ -18,7 +18,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate EntityManager"/>
<property name="name" value="hibernate-entitymanager"/>
- <property name="version" value="3.4.0.CR2"/>
+ <property name="version" value="3.4.0.GA"/>
<property name="javadoc.packagenames" value="org.hibernate.ejb.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
Modified: entitymanager/trunk/changelog.txt
===================================================================
--- entitymanager/trunk/changelog.txt 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/changelog.txt 2008-08-18 19:20:37 UTC (rev 15105)
@@ -1,6 +1,16 @@
Hibernate EntityManager Changelog
==================================
+ 3.4.0.GA (18-08-2008)
+----------------------
+
+** Bug
+ * [EJB-375] - getSingleResult potentially generates out of memory by calling list()
+
+** Task
+ * [EJB-377] - Refactor build to allow filtering of resources
+
+
3.4.0.CR2 (01-08-2008)
----------------------
Modified: entitymanager/trunk/common-build.xml
===================================================================
--- entitymanager/trunk/common-build.xml 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/common-build.xml 2008-08-18 19:20:37 UTC (rev 15105)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project name="common-build" default="dist"
xmlns:artifact="urn:maven-artifact-ant" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
<description>Common properties and targets for the HibernateExt
@@ -13,9 +13,9 @@
<property file="${common-build.basedir}/build.properties"/>
<property file="${user.home}/.ant.properties"/>
- <property name="src.dir" location="src/java"/>
- <property name="test.dir" location="src/test"/>
- <property name="test.resources.dir" location="src/test-resources"/>
+ <property name="src.dir" location="src/java"/>
+ <property name="test.dir" location="src/test"/>
+ <property name="test.resources.dir" location="src/test-resources"/>
<property name="filter.dir" location="src/filters"/>
<property name="lib.dir" location="lib"/>
<property name="build.dir" location="build"/>
@@ -45,7 +45,7 @@
<property name="javac.source" value="1.4"/>
<property name="javac.target" value="1.4"/>
- <property name="pom.file" value="pom.xml"/>
+ <property name="pom.file" value="${build.dir}/pom.xml"/>
<property name="src.jar" value="${build.dir}/src.jar"/>
<taskdef name="junit"
@@ -184,6 +184,9 @@
<tstamp>
<format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
</tstamp>
+ <tstamp>
+ <format property="releasedate" pattern="dd-MM-yyyy"/>
+ </tstamp>
<echo message="Build ${Name}-${version} (${subversion})"/>
<mkdir dir="${classes.dir}"/>
<mkdir dir="${testclasses.dir}"/>
@@ -192,27 +195,29 @@
<patternset refid="support.files"/>
</fileset>
</copy>
-
- <copy todir="${build.dir}">
+ <filter token="version" value="${version}"/>
+ <filter token="releasedate" value="${releasedate}"/>
+ <copy todir="${build.dir}" filtering="true">
<fileset dir=".">
<include name="readme.txt"/>
<include name="lgpl.txt"/>
+ <include name="pom.xml"/>
</fileset>
</copy>
- </target>
-
- <target name="get.deps.core" depends="init"
- description="retrieve the core dependencies">
- <ivy:resolve conf="default"/>
- <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]"
- conf="default"/>
- </target>
-
- <target name="get.deps.test" depends="init"
- description="retrieve the test dependencies">
- <ivy:resolve conf="test"/>
- <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/>
+ </target>
+
+ <target name="get.deps.core" depends="init"
+ description="retrieve the core dependencies">
+ <ivy:resolve conf="default"/>
+ <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]"
+ conf="default"/>
</target>
+
+ <target name="get.deps.test" depends="init"
+ description="retrieve the test dependencies">
+ <ivy:resolve conf="test"/>
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/>
+ </target>
<target name="copytest" description="Copy tests to dist dir" if="copy.test">
<mkdir dir="${dist.test.dir}"/>
@@ -302,7 +307,7 @@
<include name="*.bat"/>
</fileset>
</copy>
- <copy file="readme.txt" todir="${dist.dir}"/>
+ <copy file="${build.dir}/readme.txt" todir="${dist.dir}"/>
<copy file="lgpl.txt" todir="${dist.dir}"/>
<copy file="changelog.txt" todir="${dist.dir}"/>
<copy file="build.xml" todir="${dist.dir}"/>
@@ -345,49 +350,49 @@
<mkdir dir="${testclasses.dir}"/>
<copy todir="${testclasses.dir}" filtering="true" overwrite="true">
<fileset dir="${test.resources.dir}">
- <include name="*.properties"/>
+ <include name="*.properties"/>
<include name="*.xml"/>
</fileset>
</copy>
</target>
-
- <target name="instrument" depends="compiletest"
- description="Instrument the persistent classes"> <!-- depends="jar" -->
-
- <taskdef name="instrument"
- classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
- <classpath refid="junit.classpath"/>
- </taskdef>
-
- <instrument verbose="true">
- <fileset dir="${testclasses.dir}/org/hibernate/test">
- <include name="**/*.class"/>
- <exclude name="**/*Test$*.class"/>
- <exclude name="**/*Test.class"/>
- <exclude name="**/*Tests.class"/>
- </fileset>
- </instrument>
+
+ <target name="instrument" depends="compiletest"
+ description="Instrument the persistent classes"> <!-- depends="jar" -->
+
+ <taskdef name="instrument"
+ classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
+ <classpath refid="junit.classpath"/>
+ </taskdef>
+
+ <instrument verbose="true">
+ <fileset dir="${testclasses.dir}/org/hibernate/test">
+ <include name="**/*.class"/>
+ <exclude name="**/*Test$*.class"/>
+ <exclude name="**/*Test.class"/>
+ <exclude name="**/*Tests.class"/>
+ </fileset>
+ </instrument>
</target>
<target name="junitinstrument" depends="compiletest,instrument"
- description="Run the instrument test suite">
- <for list="${targetdb}" param="db">
- <sequential>
- <antcall target="test-resources">
- <param name="db" value="@{db}"/>
- </antcall>
- <mkdir dir="${instrumenttest.out.dir}/@{db}"/>
- <echo>Running against db: @{db}</echo>
- <junit printsummary="yes" haltonfailure="yes" dir="${basedir}"
- maxmemory="256M" fork="yes" forkmode="perBatch">
- <classpath refid="junit.classpath"/>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no">
- <fileset refid="junit.batchtestset"/>
- </batchtest>
- </junit>
- </sequential>
+ description="Run the instrument test suite">
+ <for list="${targetdb}" param="db">
+ <sequential>
+ <antcall target="test-resources">
+ <param name="db" value="@{db}"/>
+ </antcall>
+ <mkdir dir="${instrumenttest.out.dir}/@{db}"/>
+ <echo>Running against db: @{db}</echo>
+ <junit printsummary="yes" haltonfailure="yes" dir="${basedir}"
+ maxmemory="256M" fork="yes" forkmode="perBatch">
+ <classpath refid="junit.classpath"/>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no">
+ <fileset refid="junit.batchtestset"/>
+ </batchtest>
+ </junit>
+ </sequential>
</for>
</target>
Modified: entitymanager/trunk/doc/reference/en/master.xml
===================================================================
--- entitymanager/trunk/doc/reference/en/master.xml 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/doc/reference/en/master.xml 2008-08-18 19:20:37 UTC (rev 15105)
@@ -16,7 +16,7 @@
<subtitle>User guide</subtitle>
- <releaseinfo>3.4.0.CR2</releaseinfo>
+ <releaseinfo>3.4.0.GA</releaseinfo>
<mediaobject>
<imageobject>
Modified: entitymanager/trunk/ivy.xml
===================================================================
--- entitymanager/trunk/ivy.xml 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/ivy.xml 2008-08-18 19:20:37 UTC (rev 15105)
@@ -14,9 +14,9 @@
<dependencies>
<!-- compile time dependencies -->
<dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
- <dependency name="commons-annotations" rev="3.1.0.CR2" conf="default->default"/>
- <dependency name="annotations" rev="3.4.0.CR2" conf="default->default"/>
- <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR2" conf="default->default"/>
+ <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/>
+ <dependency name="annotations" rev="3.4.0.GA" conf="default->default"/>
+ <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.GA" conf="default->default"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/>
<dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/>
<dependency org="javassist" name="javassist" rev="3.4.GA" conf="default->default"/>
Modified: entitymanager/trunk/pom.xml
===================================================================
--- entitymanager/trunk/pom.xml 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/pom.xml 2008-08-18 19:20:37 UTC (rev 15105)
@@ -7,7 +7,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<packaging>pom</packaging>
- <version>3.4.0.CR2</version>
+ <version>@version@</version>
<name>Hibernate Entitity Manager</name>
<description>Hibernate Entitity Manager</description>
@@ -29,17 +29,17 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
- <version>3.1.0.CR2</version>
+ <version>3.1.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.CR2</version>
+ <version>3.4.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.0.CR2</version>
+ <version>3.3.0.GA</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: entitymanager/trunk/readme.txt
===================================================================
--- entitymanager/trunk/readme.txt 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/readme.txt 2008-08-18 19:20:37 UTC (rev 15105)
@@ -1,6 +1,6 @@
Hibernate EntityManager
==================================================
-Version: 3.4.0.CR2, 01.08.2008
+Version: @version@, @releasedate@
THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.3 (and above)
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-08-18 19:04:40 UTC (rev 15104)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-08-18 19:20:37 UTC (rev 15105)
@@ -9,7 +9,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.4.0.CR2";
+ public static final String VERSION = "3.4.0.GA";
private static final Logger log = LoggerFactory.getLogger( Version.class );
static {
15 years, 9 months
Hibernate SVN: r15104 - core/branches/Branch_3_2/test/org/hibernate/junit.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-08-18 15:04:40 -0400 (Mon, 18 Aug 2008)
New Revision: 15104
Modified:
core/branches/Branch_3_2/test/org/hibernate/junit/UnitTestCase.java
Log:
fixed validation of failure expected results
Modified: core/branches/Branch_3_2/test/org/hibernate/junit/UnitTestCase.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:03:38 UTC (rev 15103)
+++ core/branches/Branch_3_2/test/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:04:40 UTC (rev 15104)
@@ -33,9 +33,12 @@
log.info( "Starting test [" + fullTestName() + "]" );
super.runBare();
if ( doValidate ) {
- fail( "Test marked as FailureExpected, but did not fail!" );
+ throw new FailureExpectedTestPassedException();
}
}
+ catch ( FailureExpectedTestPassedException t ) {
+ throw t;
+ }
catch( Throwable t ) {
if ( doValidate ) {
skipExpectedFailure( t );
@@ -49,6 +52,12 @@
}
}
+ private static class FailureExpectedTestPassedException extends Exception {
+ public FailureExpectedTestPassedException() {
+ super( "Test marked as FailureExpected, but did not fail!" );
+ }
+ }
+
protected void skipExpectedFailure(Throwable error) {
reportSkip( "ignoring *FailuredExpected methods", "Failed with: " + error.toString() );
}
15 years, 9 months
Hibernate SVN: r15103 - core/trunk/testing/src/main/java/org/hibernate/junit.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-08-18 15:03:38 -0400 (Mon, 18 Aug 2008)
New Revision: 15103
Modified:
core/trunk/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
Log:
fixed validation of failure expected results
Modified: core/trunk/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
===================================================================
--- core/trunk/testing/src/main/java/org/hibernate/junit/UnitTestCase.java 2008-08-18 18:57:39 UTC (rev 15102)
+++ core/trunk/testing/src/main/java/org/hibernate/junit/UnitTestCase.java 2008-08-18 19:03:38 UTC (rev 15103)
@@ -62,7 +62,7 @@
log.info( "Starting test [" + fullTestName() + "]" );
super.runBare();
if ( doValidate ) {
- throw new FailureExpectedTestPassedException( "Test marked as FailureExpected, but did not fail!" );
+ throw new FailureExpectedTestPassedException();
}
}
catch ( FailureExpectedTestPassedException t ) {
@@ -82,8 +82,8 @@
}
private static class FailureExpectedTestPassedException extends Exception {
- public FailureExpectedTestPassedException(String message) {
- super( message );
+ public FailureExpectedTestPassedException() {
+ super( "Test marked as FailureExpected, but did not fail!" );
}
}
15 years, 9 months