Author: epbernard Date: 2007-03-09 12:10:33 -0500 (Fri, 09 Mar 2007) New Revision: 11268 Modified: branches/Branch_3_2/HibernateExt/entitymanager/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java branches/Branch_3_2/HibernateExt/validator/doc/reference/en/master.xml Log: minor Modified: branches/Branch_3_2/HibernateExt/entitymanager/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java =================================================================== --- branches/Branch_3_2/HibernateExt/entitymanager/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2007-03-09 17:09:19 UTC (rev 11267) +++ branches/Branch_3_2/HibernateExt/entitymanager/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2007-03-09 17:10:33 UTC (rev 11268) @@ -640,7 +640,7 @@ Object entity = getRawSession().load( sose.getEntityName(), identifier ); if ( entity instanceof Serializable ) { //avoid some user errors regarding boundary crossing - pe = new OptimisticLockException( null, e, entity ); + pe = new OptimisticLockException( null, e, entity ); } else { pe = new OptimisticLockException( e ); Modified: branches/Branch_3_2/HibernateExt/validator/doc/reference/en/master.xml =================================================================== --- branches/Branch_3_2/HibernateExt/validator/doc/reference/en/master.xml 2007-03-09 17:09:19 UTC (rev 11267) +++ branches/Branch_3_2/HibernateExt/validator/doc/reference/en/master.xml 2007-03-09 17:10:33 UTC (rev 11268) @@ -1,69 +1,65 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" - "../../../../../Hibernate3/doc/reference/support/docbook-dtd/docbookx.dtd" [ - <!ENTITY defineconstraints SYSTEM "modules/defineconstraints.xml"> - <!ENTITY checkconstraints SYSTEM "modules/checkconstraints.xml"> - ]> +"../../../../../Hibernate3/doc/reference/support/docbook-dtd/docbookx.dtd" [ +<!ENTITY defineconstraints SYSTEM "modules/defineconstraints.xml"> +<!ENTITY checkconstraints SYSTEM "modules/checkconstraints.xml"> +]> <book lang="en"> - <bookinfo> - <title>Hibernate Validator</title> + <bookinfo> + <title>Hibernate Validator</title> - <subtitle>Reference Guide</subtitle> + <subtitle>Reference Guide</subtitle> - <releaseinfo>3.2.2.GA</releaseinfo> + <releaseinfo>3.2.2.GA</releaseinfo> - <mediaobject> - <imageobject> - <imagedata fileref="images/hibernate_logo_a.png" format="png"/> - </imageobject> - </mediaobject> - </bookinfo> + <mediaobject> + <imageobject> + <imagedata fileref="images/hibernate_logo_a.png" format="png" /> + </imageobject> + </mediaobject> + </bookinfo> - <toc></toc> + <toc></toc> - <preface id="preface" revision="1"> - <title>Preface</title> - <para>Annotations are a very convenient and elegant way to specify invariant - constraints for a domain model. You can, for example, express that a - property should never be null, that the account balance should be strictly - positive, etc. These domain model constraints are declared in the bean - itself by annotating its properties. A validator can then read them and - check for constraint violations. The validation mechanism can be executed in - different layers in your application without having to duplicate any of - these rules (presentation layer, data access layer). Following the DRY principle, - Hibernate Validator has been designed for that purpose. - </para> + <preface id="preface" revision="2"> + <title>Preface</title> - <para>Hibernate Validator works at two levels. First, it is able to check - in-memory instances of a class for constraint violations. Second, it can - apply the constraints to the Hibernate metamodel and incorporate them into - the generated database schema. - </para> + <para>Annotations are a very convenient and elegant way to specify + invariant constraints for a domain model. You can, for example, express + that a property should never be null, that the account balance should be + strictly positive, etc. These domain model constraints are declared in the + bean itself by annotating its properties. A validator can then read them + and check for constraint violations. The validation mechanism can be + executed in different layers in your application without having to + duplicate any of these rules (presentation layer, data access layer). + Following the DRY principle, Hibernate Validator has been designed for + that purpose.</para> - <para>Each constraint annotation is associated to a validator implementation - responsible for checking the constraint on the entity instance. A validator - can also (optionally) apply the constraint to the Hibernate metamodel, - allowing Hibernate to generate DDL that expresses the constraint. With the - appropriate event listener, you can execute the checking operation on - inserts and updates done by Hibernate. Hibernate Validator is not limited to - use with Hibernate. You can easily use it anywhere in your - application. - </para> + <para>Hibernate Validator works at two levels. First, it is able to check + in-memory instances of a class for constraint violations. Second, it can + apply the constraints to the Hibernate metamodel and incorporate them into + the generated database schema.</para> - <para>When checking instances at runtime, Hibernate Validator returns - information about constraint violations in an array of - <classname>InvalidValue</classname> - s. Among other information, the - <classname>InvalidValue</classname> - contains an error description message - that can embed the parameter values bundle with the annotation (eg. length - limit), and message strings that may be externalized to a - <classname>ResourceBundle</classname> - . - </para> - </preface> + <para>Each constraint annotation is associated to a validator + implementation responsible for checking the constraint on the entity + instance. A validator can also (optionally) apply the constraint to the + Hibernate metamodel, allowing Hibernate to generate DDL that expresses the + constraint. With the appropriate event listener, you can execute the + checking operation on inserts and updates done by Hibernate. Hibernate + Validator is not limited to use with Hibernate. You can easily use it + anywhere in your application as well as with any Java Persistence provider + (entity listener provided).</para> - &defineconstraints; - &checkconstraints; + <para>When checking instances at runtime, Hibernate Validator returns + information about constraint violations in an array of + <classname>InvalidValue</classname> s. Among other information, the + <classname>InvalidValue</classname> contains an error description message + that can embed the parameter values bundle with the annotation (eg. length + limit), and message strings that may be externalized to a + <classname>ResourceBundle</classname> .</para> + </preface> + &defineconstraints; + + &checkconstraints; </book> \ No newline at end of file