[jboss-cvs] JBossAS SVN: r95602 - projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 27 03:01:07 EDT 2009
Author: laubai
Date: 2009-10-27 03:01:07 -0400 (Tue, 27 Oct 2009)
New Revision: 95602
Modified:
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/architecture.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/batch.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/configuration.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/entitymanagerapi.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_ejbql.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_native.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/transactions.xml
Log:
Added changes in JBPAPP-1723.
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/architecture.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/architecture.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/architecture.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -194,7 +194,7 @@
view of the application user, and implement it using an extended
persistence context. Please refer to the Hibernate reference manual or
the book Hibernate In Action for more information about this pattern.
- JBoss Seam is a framework tht link together JSF and EJB3 around the
+ JBoss Seam is a framework that link together JSF and EJB3 around the
notion of conversation and unit of work. For an application-managed
entity manager the persistence context is created when the entity
manager is created and kept until the entity manager is closed. In an
@@ -203,7 +203,7 @@
persistence context is attached to a transaction. The transaction
typically occurs at the user process end, allowing the whole process to
be commited or rollbacked. For application-managed entity manager only
- support the exctended persistence context.</para>
+ support the extended persistence context.</para>
<para>A resource-local entity manager or an entity manager created with
<literal>EntityManagerFactory.createEntityManager()</literal>
@@ -274,7 +274,7 @@
<section id="architecture-javase" revision="1">
<title>Java SE environments</title>
- <para>In a Java SE environment only extented context application-managed
+ <para>In a Java SE environment only extended context application-managed
entity managers are available. You can retrieve an entity manger using the
<literal>EntityManagerFactory</literal> API. Only resource-local entity
managers are available. In other words, JTA transactions and persistence
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/batch.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/batch.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/batch.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -102,8 +102,8 @@
<para>The <literal>int</literal> value returned by the
<literal>Query.executeUpdate()</literal> method indicate the number of
- entities effected by the operation. This may or may not correlate with the
- number of rows effected in the database. An EJB-QL bulk operation might
+ entities affected by the operation. This may or may not correlate with the
+ number of rows affected in the database. An EJB-QL bulk operation might
result in multiple actual SQL statements being executed, for
joined-subclass, for example. The returned number indicates the number of
actual entities affected by the statement. Going back to the example of
@@ -112,4 +112,4 @@
mapped, but also the "root" table and potentially joined-subclass tables
further down the inheritence hierarchy.</para>
</sect1>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/configuration.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/configuration.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/configuration.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -396,7 +396,7 @@
<entry>If true, the persistence context will be discarded (think
clear() when the method is called. Otherwise the persistence
context will stay alive till the transaction completion: all
- objects will remain managed, and any change will be sy,chronized
+ objects will remain managed, and any change will be synchronized
with the database (default to false, ie wait the transaction
completion)</entry>
</row>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/entitymanagerapi.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/entitymanagerapi.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/entitymanagerapi.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -102,7 +102,7 @@
<para>In some cases, you don't really want to load the object state, but
just having a reference to it (ie a proxy). You can get this reference
using the <literal>getReference()</literal> method. This is especially
- useful to link a child to its parent wo having to load the parent.</para>
+ useful to link a child to its parent without having to load the parent.</para>
<programlisting>child = new Child();
child.SetName("Henry");
@@ -421,7 +421,7 @@
and any changes to persistent state will be persisted when the Entity
manager is flushed (discussed later in this chapter). There is no need to
call a particular method to make your modifications persistent. A
- straightforward wayt to update the state of an entity instance is to
+ straightforward way to update the state of an entity instance is to
<methodname>find()</methodname> it, and then manipulate it directly, while
the persistence context is open:</para>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_ejbql.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_ejbql.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_ejbql.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -254,7 +254,7 @@
</itemizedlist>
<para>You may use arithmetic operators, concatenation, and recognized SQL
- functions in the select clause (dpending on configured dialect, HQL specific feature):</para>
+ functions in the select clause (depending on configured dialect, HQL specific feature):</para>
<programlisting>select cat.weight + sum(kitten.weight)
from Cat cat
@@ -567,7 +567,7 @@
<literal>elements</literal>, <literal>indices</literal>,
<literal>minindex</literal>, <literal>maxindex</literal>,
<literal>minelement</literal>, <literal>maxelement</literal> - may only be
- used in the where clause in Hibernate3.</para>
+ used in the where clause in Hibernate.</para>
<para>In HQL, elements of indexed collections (arrays, lists, maps) may be
referred to by index (in a where clause only):</para>
@@ -763,11 +763,11 @@
where order.paid = false
and order.customer = :customer
and price.product = product
- and catalog.effectiveDate < sysdate
+ and catalog.effectiveDate < current_date()
and catalog.effectiveDate >= all (
select cat.effectiveDate
from Catalog as cat
- where cat.effectiveDate < sysdate
+ where cat.effectiveDate < current_date()
)
group by order
having sum(price.amount) > :minAmount
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_native.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_native.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/query_native.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -45,43 +45,48 @@
<literal>@SqlResultSetMapping </literal>has a name wich is used when
creating a SQL query on <literal>EntityManager</literal>.</para>
- <programlisting>@SqlResultSetMapping(name="GetNightAndArea", entities={
- @EntityResult(name="org.hibernate.test.annotations.query.Night", fields = {
- @FieldResult(name="id", column="nid"),
- @FieldResult(name="duration", column="night_duration"),
- @FieldResult(name="date", column="night_date"),
- @FieldResult(name="area", column="area_id")
- }),
- @EntityResult(name="org.hibernate.test.annotations.query.Area", fields = {
- @FieldResult(name="id", column="aid"),
- @FieldResult(name="name", column="name")
- })
+ <programlisting>@SqlResultSetMapping(name="GetNightAndArea",
+ entities={
+ @EntityResult(entityClass=org.hibernate.test.annotations.query.Night.class, fields
+ = {
+ @FieldResult(name="id", column="nid"),
+ @FieldResult(name="duration", column="night_duration"),
+ @FieldResult(name="date", column="night_date"),
+ @FieldResult(name="area", column="area_id")
+ }),
+ @EntityResult(entityClass=org.hibernate.test.annotations.query.Area.class, fields
+ = {
+ @FieldResult(name="id", column="aid"),
+ @FieldResult(name="name", column="name")
+ })
}
)
-//or
- at SqlResultSetMapping(name="defaultSpaceShip", entities=@EntityResult(name="org.hibernate.test.annotations.query.SpaceShip"))</programlisting>
+ at SqlResultSetMapping(name="defaultSpaceShip",
+entities=@EntityResult(entityClass=org.hibernate.test.annotations.query.SpaceShip.class))</programlisting>
<para>You can also define scalar results and even mix entity results and
scalar results</para>
- <programlisting>@SqlResultSetMapping(name="ScalarAndEntities",
- entities={
- @EntityResult(name="org.hibernate.test.annotations.query.Night", fields = {
- @FieldResult(name="id", column="nid"),
- @FieldResult(name="duration", column="night_duration"),
- @FieldResult(name="date", column="night_date"),
- @FieldResult(name="area", column="area_id")
- }),
- @EntityResult(name="org.hibernate.test.annotations.query.Area", fields = {
- @FieldResult(name="id", column="aid"),
- @FieldResult(name="name", column="name")
- })
- },
- columns={
- @ColumnResult(name="durationInSec")
- }
-)</programlisting>
+ <programlisting>@SqlResultSetMapping(name="ScalarAndEntities",
+ entities={
+ @EntityResult(entityClass=org.hibernate.test.annotations.query.Night.class,
+ fields = {
+ @FieldResult(name="id", column="nid"),
+ @FieldResult(name="duration", column="night_duration"),
+ @FieldResult(name="date", column="night_date"),
+ @FieldResult(name="area", column="area_id")
+ }),
+ @EntityResult(entityClass=org.hibernate.test.annotations.query.Area.class,
+ fields = {
+ @FieldResult(name="id", column="aid"),
+ @FieldResult(name="name", column="name")
+ })
+ },
+ columns={
+ @ColumnResult(name="durationInSec")
+ }
+) </programlisting>
<para>The SQL query will then have to return a column alias
<literal>durationInSec</literal>.</para>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/transactions.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/transactions.xml 2009-10-27 06:41:58 UTC (rev 95601)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Entity_Manager/en-US/transactions.xml 2009-10-27 07:01:07 UTC (rev 95602)
@@ -610,7 +610,8 @@
<itemizedlist>
<listitem>
- <para>IllegalArgumentException: something wrong happen</para>
+ <para>IllegalArgumentException: an argument is not permitted, not recognized,
+ or in an incorrect format (or similar).</para>
</listitem>
<listitem>
@@ -638,7 +639,7 @@
<para>Hibernate wraps <literal>SQLException</literal>s thrown while
interacting with the database in a <literal>JDBCException</literal>. In
- fact, Hibernate will attempt to convert the eexception into a more
+ fact, Hibernate will attempt to convert the exception into a more
meningful subclass of <literal>JDBCException</literal>. The underlying
<literal>SQLException</literal> is always available via
<literal>JDBCException.getCause()</literal>. Hibernate converts the
More information about the jboss-cvs-commits
mailing list