You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by kw...@apache.org on 2006/09/06 18:35:07 UTC
svn commit: r440775 [2/5] - in /incubator/openjpa/sandboxes/OPENJPA-24:
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-kernel/src/main/java/org/apache/openjpa/meta/ openjpa-kerne...
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java Wed Sep 6 09:35:03 2006
@@ -28,169 +28,80 @@
* Represents the L2 cache over the data store.
*
* @author Abe White
- * @since 0.4.0
+ * @author Pinaki Poddar
+ * @since 0.4.1
* @published
*/
-public class StoreCache {
+public interface StoreCache {
public static final String NAME_DEFAULT = DataCache.NAME_DEFAULT;
- private final MetaDataRepository _repos;
- private final DelegatingDataCache _cache;
-
- /**
- * Constructor; supply delegate.
- */
- public StoreCache(EntityManagerFactoryImpl emf, DataCache cache) {
- _repos = emf.getConfiguration().getMetaDataRepositoryInstance();
- _cache = new DelegatingDataCache(cache,
- PersistenceExceptions.TRANSLATOR);
- }
-
/**
* Delegate.
*/
- public DataCache getDelegate() {
- return _cache.getDelegate();
- }
+ public DataCache getDelegate();
/**
* Whether the cache contains data for the given oid.
*/
- public boolean contains(Class cls, Object oid) {
- return _cache.getDelegate() != null
- && _cache.contains(OpenJPAPersistence.toOpenJPAObjectId
- (getMetaData(cls), oid));
- }
+ public boolean contains(Class cls, Object oid);
/**
* Whether the cache contains data for the given oids.
*/
- public boolean containsAll(Class cls, Object... oids) {
- return containsAll(cls, Arrays.asList(oids));
- }
+ public boolean containsAll(Class cls, Object... oids);
/**
* Whether the cache contains data for the given oids.
*/
- public boolean containsAll(Class cls, Collection oids) {
- if (_cache.getDelegate() == null)
- return oids.isEmpty();
-
- BitSet set = _cache.containsAll(OpenJPAPersistence.toOpenJPAObjectIds
- (getMetaData(cls), oids));
- for (int i = 0; i < oids.size(); i++)
- if (!set.get(i))
- return false;
- return true;
- }
+ public boolean containsAll(Class cls, Collection oids);
/**
* Pin the data for the given oid to the cache.
*/
- public void pin(Class cls, Object oid) {
- if (_cache.getDelegate() != null)
- _cache.pin(
- OpenJPAPersistence.toOpenJPAObjectId(getMetaData(cls), oid));
- }
+ public void pin(Class cls, Object oid);
/**
* Pin the data for the given oids to the cache.
*/
- public void pinAll(Class cls, Object... oids) {
- pinAll(cls, Arrays.asList(oids));
- }
+ public void pinAll(Class cls, Object... oids);
/**
* Pin the data for the given oids to the cache.
*/
- public void pinAll(Class cls, Collection oids) {
- if (_cache.getDelegate() != null)
- _cache
- .pinAll(OpenJPAPersistence.toOpenJPAObjectIds(getMetaData(cls),
- oids));
- }
+ public void pinAll(Class cls, Collection oids);
/**
* Unpin the data for the given oid from the cache.
*/
- public void unpin(Class cls, Object oid) {
- if (_cache.getDelegate() != null)
- _cache.unpin(OpenJPAPersistence.toOpenJPAObjectId(getMetaData(cls),
- oid));
- }
+ public void unpin(Class cls, Object oid);
/**
* Unpin the data for the given oids from the cache.
*/
- public void unpinAll(Class cls, Object... oids) {
- unpinAll(cls, Arrays.asList(oids));
- }
+ public void unpinAll(Class cls, Object... oids);
/**
* Unpin the data for the given oids from the cache.
*/
- public void unpinAll(Class cls, Collection oids) {
- if (_cache.getDelegate() != null)
- _cache.unpinAll(
- OpenJPAPersistence.toOpenJPAObjectIds(getMetaData(cls),
- oids));
- }
+ public void unpinAll(Class cls, Collection oids);
/**
* Remove data for the given oid from the cache.
*/
- public void evict(Class cls, Object oid) {
- if (_cache.getDelegate() != null)
- _cache.remove(OpenJPAPersistence.toOpenJPAObjectId(getMetaData(cls),
- oid));
- }
-
+ public void evict(Class cls, Object oid);
/**
* Remove data for the given oids from the cache.
*/
- public void evictAll(Class cls, Object... oids) {
- evictAll(cls, Arrays.asList(oids));
- }
+ public void evictAll(Class cls, Object... oids);
/**
* Remove data for the given oids from the cache.
*/
- public void evictAll(Class cls, Collection oids) {
- if (_cache.getDelegate() != null)
- _cache.removeAll(
- OpenJPAPersistence.toOpenJPAObjectIds(getMetaData(cls),
- oids));
- }
+ public void evictAll(Class cls, Collection oids);
/**
* Clear the cache.
*/
- public void evictAll() {
- _cache.clear();
- }
-
- /**
- * Return metadata for the given class, throwing the proper exception
- * if not persistent.
- */
- private ClassMetaData getMetaData(Class cls) {
- try {
- return _repos.getMetaData(cls, null, true);
- } catch (RuntimeException re) {
- throw PersistenceExceptions.toPersistenceException(re);
- }
- }
-
- public int hashCode() {
- return _cache.hashCode();
- }
-
- public boolean equals(Object other) {
- if (other == this)
- return true;
- if (!(other instanceof StoreCache))
- return false;
- return _cache.equals (((StoreCache) other)._cache);
- }
+ public void evictAll();
}
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_arch.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_arch.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_arch.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_arch.xml Wed Sep 6 09:35:03 2006
@@ -17,8 +17,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data 400 x 256 (see README) -->
- <imagedata fileref="img/jpa-arch.png" width="267px">
- </imagedata>
+ <imagedata fileref="img/jpa-arch.png" width="267px"/>
+
</imageobject>
<textobject>
<phrase>
@@ -262,8 +262,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 427 x 355 (see README) -->
- <imagedata fileref="img/jpa-exceptions.png" width="285px">
- </imagedata>
+ <imagedata fileref="img/jpa-exceptions.png" width="285px"/>
+
</imageobject>
<textobject>
<phrase>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_em.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_em.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_em.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_em.xml Wed Sep 6 09:35:03 2006
@@ -10,8 +10,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 283 x 391 (see README) -->
- <imagedata fileref="img/entitymanager.png" width="189px">
- </imagedata>
+ <imagedata fileref="img/entitymanager.png" width="189px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -401,7 +401,7 @@
<para>
JPA provides support for this pattern by automatically detaching
entities when they are serialized or when a persistence context ends (see
-<xref linkend="jpa_overview_emfactory_perscontext"></xref> for an exploration of
+<xref linkend="jpa_overview_emfactory_perscontext"/> for an exploration of
persistence contexts). The JPA <emphasis>merge</emphasis> API
re-attaches detached entities. This allows you to detach a persistent instance,
modify the detached instance offline, and merge the instance back into an
@@ -432,7 +432,7 @@
<para>
OpenJPA offers enhancements to JPA detachment functionality,
including additional options to control which fields are detached. See
-<xref linkend="ref_guide_detach"></xref> in the Reference Guide for details.
+<xref linkend="ref_guide_detach"/> in the Reference Guide for details.
</para>
</note>
<para>
@@ -518,7 +518,7 @@
<note>
<para>
OpenJPA has additional APIs for controlling object locking. See
-<xref linkend="ref_guide_locking"></xref> in the Reference Guide for details.
+<xref linkend="ref_guide_locking"/> in the Reference Guide for details.
</para>
</note>
<para>
@@ -528,8 +528,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 445 x 337 (see README) -->
- <imagedata fileref="img/jpa-state-transitions.png" width="297px">
- </imagedata>
+ <imagedata fileref="img/jpa-state-transitions.png" width="297px"/>
+
</imageobject>
</mediaobject>
</section>
@@ -709,7 +709,7 @@
following methods allow you to interact with the management of persistent
identities. The behavior of these methods is deeply affected by the persistence
context type of the <classname>EntityManager</classname>; see
-<xref linkend="jpa_overview_emfactory_perscontext"></xref> for an explanation of
+<xref linkend="jpa_overview_emfactory_perscontext"/> for an explanation of
persistence contexts.
</para>
<programlisting>
@@ -867,7 +867,7 @@
</classname> does not already have a connection to the datastore, it obtains one
for the flush and retains it for the duration of the transaction. Any exceptions
during flush cause the transaction to be marked for rollback. See
-<xref linkend="jpa_overview_trans"></xref>.
+<xref linkend="jpa_overview_trans"/>.
</para>
<para>
Flushing requires an active transaction. If there isn't a transaction in
@@ -924,7 +924,7 @@
OpenJPA only flushes before a query if the query might be affected by data
changed in the current transaction. Additionally, OpenJPA allows fine-grained
control over flushing behavior. See the Reference Guide's
-<xref linkend="ref_guide_dbsetup_retain"></xref>.
+<xref linkend="ref_guide_dbsetup_retain"/>.
</para>
</note>
<programlisting>
@@ -982,7 +982,7 @@
<classname>Query</classname> objects are used to find entities matching certain
criteria. The <methodname>createQuery</methodname> method creates a query using
the given Java Persistence Query Language (JPQL) string. See
-<xref linkend="jpa_overview_query"></xref> for details.
+<xref linkend="jpa_overview_query"/> for details.
</para>
<programlisting>
public Query createNamedQuery (String name);
@@ -991,7 +991,7 @@
This method retrieves a query defined in metadata by name. The returned
<classname>Query</classname> instance is initialized with the information
declared in metadata. For more information on named queries, read
-<xref linkend="jpa_overview_query_named"></xref>.
+<xref linkend="jpa_overview_query_named"/>.
</para>
<programlisting>
public Query createNativeQuery (String sql);
@@ -1001,7 +1001,7 @@
<para>
<emphasis>Native</emphasis> queries are queries in the datastore's native
language. For relational databases, this the Structured Query Language (SQL).
-<xref linkend="jpa_overview_sqlquery"></xref> elaborates on JPA's
+<xref linkend="jpa_overview_sqlquery"/> elaborates on JPA's
native query support.
</para>
</section>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_emfactory.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_emfactory.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_emfactory.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_emfactory.xml Wed Sep 6 09:35:03 2006
@@ -10,8 +10,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 418 x 274 (see README) -->
- <imagedata fileref="img/entitymanagerfactory.png" width="279px">
- </imagedata>
+ <imagedata fileref="img/entitymanagerfactory.png" width="279px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -64,7 +64,7 @@
Java Connector Architecture (JCA) in a managed environment, or the <classname>
Persistence</classname> class' <methodname>createEntityManagerFactory
</methodname> methods in an unmanaged environment, as described in
-<xref linkend="jpa_overview_persistence"></xref>. These strategies allow
+<xref linkend="jpa_overview_persistence"/>. These strategies allow
vendors to pool factories, cutting down on resource utilization.
</para>
<para>
@@ -153,7 +153,7 @@
The last option uses reflection to configure any property of OpenJPA's
<classname>EntityManager</classname> implementation with the value supplied in
your map. The first options correspond exactly to the same-named OpenJPA
-configuration keys described in <xref linkend="ref_guide_conf"></xref> of the
+configuration keys described in <xref linkend="ref_guide_conf"/> of the
Reference Guide.
</para>
</note>
@@ -186,7 +186,7 @@
detached</emphasis>. A detached entity is no longer under the control of the
<classname>EntityManager</classname>, and no longer has access to datastore
resources. We discuss detachment is detail in
-<xref linkend="jpa_overview_em_lifecycle"></xref>. For now, it is sufficient to
+<xref linkend="jpa_overview_em_lifecycle"/>. For now, it is sufficient to
know that detachment as has two obvious consequences:
</para>
<orderedlist>
@@ -208,8 +208,8 @@
<note>
<para>
OpenJPA offers several features related to detaching entities. See
-<xref linkend="ref_guide_detach"></xref> in the Reference Guide.
-<xref linkend="ref_guide_detach_graph"></xref> in particular describes how to
+<xref linkend="ref_guide_detach"/> in the Reference Guide.
+<xref linkend="ref_guide_detach_graph"/> in particular describes how to
use the <literal>DetachState</literal> setting to boost the performance of
merging detached entities.
</para>
@@ -256,7 +256,7 @@
<para>
When the next transaction begins, the <classname>EntityManager</classname> will
begin a new persistence context, and will again start returning managed
-entities. As you'll see in <xref linkend="jpa_overview_em"></xref>, you can
+entities. As you'll see in <xref linkend="jpa_overview_em"/>, you can
also merge the previously-detached entites back into the new persistence
context.
</para>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_mapping.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_mapping.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_mapping.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_mapping.xml Wed Sep 6 09:35:03 2006
@@ -58,20 +58,20 @@
<note>
<para>
OpenJPA offers tools to automate mapping and schema creation. See
-<xref linkend="ref_guide_mapping"></xref> in the Reference Guide.
+<xref linkend="ref_guide_mapping"/> in the Reference Guide.
</para>
</note>
<para>
Throughout this chapter, we will draw on the object model introduced in
-<xref linkend="jpa_overview_meta"></xref>. We present that model again below.
+<xref linkend="jpa_overview_meta"/>. We present that model again below.
As we discuss various aspects of mapping metadata, we will zoom in on specific
areas of the model and show how we map the object layer to the relational layer.
</para>
<mediaobject>
<imageobject>
<!-- PNG image data, 553 x 580 (see README) -->
- <imagedata fileref="img/jpa-meta-model.png" width="369px">
- </imagedata>
+ <imagedata fileref="img/jpa-meta-model.png" width="369px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -100,7 +100,7 @@
class. If you omit the <classname>Table</classname> annotation, base entity
classes default to a table with their unqualified class name. The default table
of an entity subclass depends on the inheritance strategy, as you will see in
-<xref linkend="jpa_overview_mapping_inher"></xref>.
+<xref linkend="jpa_overview_mapping_inher"/>.
</para>
<para>
<classname>Table</classname>s have the following properties:
@@ -173,8 +173,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 513 x 410 (see README) -->
- <imagedata fileref="img/mapping-tables.png" width="341px">
- </imagedata>
+ <imagedata fileref="img/mapping-tables.png" width="341px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -703,8 +703,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 513 x 410 (see README) -->
- <imagedata fileref="img/jpa-mapping-identity.png" width="341px">
- </imagedata>
+ <imagedata fileref="img/jpa-mapping-identity.png" width="341px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -883,7 +883,7 @@
One aspect of identity mapping not covered in the previous section is JPA's
ability to automatically assign a value to your numeric identity fields using
<emphasis>generators</emphasis>. We discussed the available generator types in
-<xref linkend="jpa_overview_meta_id"></xref>. Now we show you how to define
+<xref linkend="jpa_overview_meta_id"/>. Now we show you how to define
named generators.
</para>
<section id="jpa_overview_mapping_sequence_seqgen">
@@ -978,7 +978,7 @@
set the <literal>sequenceName</literal> to <literal>system</literal> to use the
system sequence defined by the <link linkend="openjpa.Sequence"><literal>
openjpa.Sequence</literal></link> configuration property. See the Reference
-Guide's <xref linkend="ref_guide_sequence"></xref> for details.
+Guide's <xref linkend="ref_guide_sequence"/> for details.
</para>
</note>
<para>
@@ -1493,7 +1493,7 @@
<para>
OpenJPA allows you to vary your inheritance strategy for each class, rather than
forcing a single strategy per inheritance hierarchy. See
-<xref linkend="ref_guide_mapping_jpa"></xref> in the Reference Guide for
+<xref linkend="ref_guide_mapping_jpa"/> in the Reference Guide for
details.
</para>
</note>
@@ -1527,8 +1527,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 266 x 203 (see README) -->
- <imagedata fileref="img/inher-superclass-table.png" width="177px">
- </imagedata>
+ <imagedata fileref="img/inher-superclass-table.png" width="177px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -1701,8 +1701,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 256 x 229 (see README) -->
- <imagedata fileref="img/jpa-inher-joined.png" width="171px">
- </imagedata>
+ <imagedata fileref="img/jpa-inher-joined.png" width="171px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -1732,7 +1732,7 @@
<literal>String columnDefinition</literal>: This property has the same meaning
as the <literal>columnDefinition</literal> property on the <classname>Column
</classname> annotation, described in
-<xref linkend="jpa_overview_mapping_column"></xref>.
+<xref linkend="jpa_overview_mapping_column"/>.
</para>
</listitem>
</itemizedlist>
@@ -1907,7 +1907,7 @@
<para>
When executing a select against a hierarchy that uses joined subclass table
inheritance, you must consider how to load subclass state.
-<xref linkend="ref_guide_perfpack_eager"></xref> in the Reference Guide
+<xref linkend="ref_guide_perfpack_eager"/> in the Reference Guide
describes OpenJPA's options for efficient data loading.
</para>
</note>
@@ -1948,8 +1948,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 283 x 247 (see README) -->
- <imagedata fileref="img/inher-tpc.png" width="189px">
- </imagedata>
+ <imagedata fileref="img/inher-tpc.png" width="189px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -1965,7 +1965,7 @@
<literal>isbn</literal>, <literal>title</literal>, and other <classname>
Magazine</classname> fields. These columns would default to the names used in
<classname>Magazine</classname>'s mapping metadata.
-<xref linkend="jpa_overview_mapping_embed"></xref> will show you how to use
+<xref linkend="jpa_overview_mapping_embed"/> will show you how to use
<literal>AttributeOverride</literal>s and <literal>AssociationOverride</literal>
s to override superclass field mappings.
</para>
@@ -2054,7 +2054,7 @@
</para>
<note>
<para>
-<xref linkend="ref_guide_mapping_limits_tpc"></xref> in the Reference Guide
+<xref linkend="ref_guide_mapping_limits_tpc"/> in the Reference Guide
describes the limitations OpenJPA places on table-per-class mapping.
</para>
</note>
@@ -2071,8 +2071,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 513 x 410 (see README) -->
- <imagedata fileref="img/jpa-inher-all.png" width="341px">
- </imagedata>
+ <imagedata fileref="img/jpa-inher-all.png" width="341px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -2368,7 +2368,7 @@
<literal>String columnDefinition</literal>: This property has the same meaning
as the <literal>columnDefinition</literal> property on the <classname>Column
</classname> annotation, described in
-<xref linkend="jpa_overview_mapping_column"></xref>.
+<xref linkend="jpa_overview_mapping_column"/>.
</para>
</listitem>
<listitem>
@@ -2451,7 +2451,7 @@
</para>
<para>
OpenJPA defines additional discriminator strategies; see
-<xref linkend="ref_guide_mapping_jpa"></xref> in the Reference Guide for
+<xref linkend="ref_guide_mapping_jpa"/> in the Reference Guide for
details. OpenJPA also supports final entity classes. OpenJPA does not use a
discriminator on final classes.
</para>
@@ -2463,8 +2463,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 513 x 410 (see README) -->
- <imagedata fileref="img/jpa-discrim-all.png" width="341px">
- </imagedata>
+ <imagedata fileref="img/jpa-discrim-all.png" width="341px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -2730,7 +2730,7 @@
<para>
The following sections enumerate the myriad of field mappings JPA
supports. JPA augments the persistence metadata covered in
-<xref linkend="jpa_overview_meta"></xref> with many new object-relational
+<xref linkend="jpa_overview_meta"/> with many new object-relational
annotations. As we explore the library of standard mappings, we introduce each
of these enhancements in context.
</para>
@@ -2738,7 +2738,7 @@
<para>
OpenJPA supports many additional field types, and allows you to create custom
mappings for unsupported field types or database schemas. See the Reference
-Guide's <xref linkend="ref_guide_mapping"></xref> for complete coverage of
+Guide's <xref linkend="ref_guide_mapping"/> for complete coverage of
OpenJPA's mapping capabilities.
</para>
</note>
@@ -2768,7 +2768,7 @@
<para>
A <emphasis>basic</emphasis> field mapping stores the field value directly into
a database column. The following field metadata types use basic mapping. These
-types were defined in <xref linkend="jpa_overview_meta_field"></xref>.
+types were defined in <xref linkend="jpa_overview_meta_field"/>.
</para>
<itemizedlist>
<listitem>
@@ -2792,11 +2792,11 @@
<para>
In fact, you have already seen examples of basic field mappings in this chapter
- the mapping of all identity fields in
-<xref linkend="jpa_overview_mapping_identityex"></xref>. As you saw in that
+<xref linkend="jpa_overview_mapping_identityex"/>. As you saw in that
section, to write a basic field mapping you use the <classname>Column
</classname> annotation to describe the column the field value is stored in. We
discussed the <classname>Column</classname> annotation in
-<xref linkend="jpa_overview_mapping_column"></xref>. Recall that the name of
+<xref linkend="jpa_overview_mapping_column"/>. Recall that the name of
the column defaults to the field name, and the type of the column defaults to an
appropriate type for the field type. These defaults allow you to sometimes omit
the annotation altogether.
@@ -2962,14 +2962,14 @@
metadata relies on defaults where possible. Also note that as a mapped
superclass, <classname>Document</classname> can define mappings that will
automatically transfer to its subclass' tables. In
-<xref linkend="jpa_overview_mapping_embed"></xref>, you will see how a subclass
+<xref linkend="jpa_overview_mapping_embed"/>, you will see how a subclass
can override its mapped superclass' mappings.
</para>
<mediaobject>
<imageobject>
<!-- PNG image data, 580 x 553 (see README) -->
- <imagedata fileref="img/jpa-basic-field.png" width="387px">
- </imagedata>
+ <imagedata fileref="img/jpa-basic-field.png" width="387px"/>
+
</imageobject>
</mediaobject>
<example id="jpa_overview_mapping_basicex">
@@ -3366,15 +3366,15 @@
<para>
You define secondary tables with the <classname>SecondaryTable</classname>
annotation. This annotation has all the properties of the <classname>Table
-</classname> annotation covered in <xref linkend="jpa_overview_mapping_table">
-</xref>, plus a <literal> pkJoinColumns</literal> property.
+</classname> annotation covered in <xref linkend="jpa_overview_mapping_table"/>
+, plus a <literal> pkJoinColumns</literal> property.
</para>
<para>
The <literal>pkJoinColumns</literal> property is an array of <classname>
PrimaryKeyJoinColumn</classname>s dictating how to join secondary table records
to their owning primary table records. Each <classname>PrimaryKeyJoinColumn
</classname> joins a secondary table column to a primary key column in the
-primary table. See <xref linkend="jpa_overview_mapping_inher_joined"></xref>
+primary table. See <xref linkend="jpa_overview_mapping_inher_joined"/>
above for coverage of <classname>PrimaryKeyJoinColumn</classname>'s properties.
</para>
<para>
@@ -3384,14 +3384,14 @@
</para>
<para>
In the following example, we move the <literal>Article.content</literal> field
-we mapped in <xref linkend="jpa_overview_mapping_basic"></xref> into a joined
+we mapped in <xref linkend="jpa_overview_mapping_basic"/> into a joined
secondary table, like so:
</para>
<mediaobject>
<imageobject>
<!-- PNG image data, 284 x 167 (see README) -->
- <imagedata fileref="img/secondary-table.png" width="189px">
- </imagedata>
+ <imagedata fileref="img/secondary-table.png" width="189px"/>
+
</imageobject>
</mediaobject>
<example id="jpa_overview_mapping_secondaryex">
@@ -3459,7 +3459,7 @@
</secondary>
</indexterm>
<para>
-<xref linkend="jpa_overview_meta"></xref> describes JPA's concept of <emphasis>
+<xref linkend="jpa_overview_meta"/> describes JPA's concept of <emphasis>
embeddable</emphasis> objects. The field values of embedded objects are stored
as part of the owning record, rather than as a separate database record. Thus,
instead of mapping a relation to an embeddable object as a foreign key, you map
@@ -3469,8 +3469,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 464 x 203 (see README) -->
- <imagedata fileref="img/jpa-embedded.png" width="309px">
- </imagedata>
+ <imagedata fileref="img/jpa-embedded.png" width="309px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -3731,8 +3731,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 374 x 386 (see README) -->
- <imagedata fileref="img/jpa-direct-relation.png" width="249px">
- </imagedata>
+ <imagedata fileref="img/jpa-direct-relation.png" width="249px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -3769,7 +3769,7 @@
, <literal>insertable</literal>, <literal> updatable</literal>, <literal>
columnDefinition</literal>, and <literal>table</literal> properties as the
<classname> Column</classname> annotation. See
-<xref linkend="jpa_overview_mapping_column"></xref> for details on these
+<xref linkend="jpa_overview_mapping_column"/> for details on these
properties.
</para>
<para>
@@ -3828,7 +3828,7 @@
<note>
<para>
OpenJPA supports many non-standard joins. See
-<xref linkend="ref_guide_mapping_notes_nonstdjoins"></xref> in the Reference
+<xref linkend="ref_guide_mapping_notes_nonstdjoins"/> in the Reference
Guide for details.
</para>
</note>
@@ -4017,8 +4017,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 391 x 407 (see README) -->
- <imagedata fileref="img/jpa-assoc-table.png" width="261px">
- </imagedata>
+ <imagedata fileref="img/jpa-assoc-table.png" width="261px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -4049,12 +4049,12 @@
</classname> sshowing how to associate join table records with the owning row in
the primary table. This property mirrors the <literal>pkJoinColumns</literal>
property of the <classname> SecondaryTable</classname> annotation in
-functionality. See <xref linkend="jpa_overview_mapping_secondary"></xref> to
+functionality. See <xref linkend="jpa_overview_mapping_secondary"/> to
refresh your memory on secondary tables.
</para>
<para>
If this is a bidirectional relation (see
-<xref linkend="jpa_overview_meta_mappedby"></xref> ), the name of a join column
+<xref linkend="jpa_overview_meta_mappedby"/> ), the name of a join column
defaults to the inverse field name, plus an underscore, plus the referenced
primary key column name. Otherwise, the join column name defaults to the field's
owning entity name, plus an underscore, plus the referenced primary key column
@@ -4067,7 +4067,7 @@
JoinColumns</classname> showing how to associate join table records with the
records that form the elements of the collection. These join columns are used
just like the join columns for direct relations, and they have the same naming
-defaults. Read <xref linkend="jpa_overview_mapping_rel"></xref> for a review of
+defaults. Read <xref linkend="jpa_overview_mapping_rel"/> for a review of
direct relation mapping.
</para>
</listitem>
@@ -4200,7 +4200,7 @@
</secondary>
</indexterm>
<para>
-<xref linkend="jpa_overview_meta_mappedby"></xref> introduced bidirectional
+<xref linkend="jpa_overview_meta_mappedby"/> introduced bidirectional
relations. To map a bidirectional relation, you map one field normally using the
annotations we have covered throughout this chapter. Then you use the <literal>
mappedBy</literal> property of the other field's metadata annotation or the
@@ -4249,13 +4249,13 @@
tables</link> or <link linkend="jpa_overview_mapping_bidi">bidirectional
relations</link>. The only additions are the <classname>MapKey</classname>
annotation and <literal>map-key</literal> element to declare the key field. We
-covered these additions in in <xref linkend="jpa_overview_meta_mapkey"></xref>.
+covered these additions in in <xref linkend="jpa_overview_meta_mapkey"/>.
</para>
<mediaobject>
<imageobject>
<!-- PNG image data, 382 x 274 (see README) -->
- <imagedata fileref="img/jpa-map.png" width="255px">
- </imagedata>
+ <imagedata fileref="img/jpa-map.png" width="255px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -4339,8 +4339,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 553 x 580 (see README) -->
- <imagedata fileref="img/jpa-meta-model.png" width="369px">
- </imagedata>
+ <imagedata fileref="img/jpa-meta-model.png" width="369px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -4351,8 +4351,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 490 x 662 (see README) -->
- <imagedata fileref="img/jpa-data-model.png" width="326px">
- </imagedata>
+ <imagedata fileref="img/jpa-data-model.png" width="326px"/>
+
</imageobject>
</mediaobject>
<para>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_meta.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_meta.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_meta.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_meta.xml Wed Sep 6 09:35:03 2006
@@ -74,16 +74,16 @@
<para>
We describe the standard metadata annotations and XML equivalents throughout
this chapter. The full schema for XML mapping files is available in
-<xref linkend="jpa_overview_meta_xml"></xref>. JPA also standardizes relational
+<xref linkend="jpa_overview_meta_xml"/>. JPA also standardizes relational
mapping metadata and named query metadata, which we discuss in
-<xref linkend="jpa_overview_mapping"></xref> and
-<xref linkend="jpa_overview_query_named"></xref> respectively.
+<xref linkend="jpa_overview_mapping"/> and
+<xref linkend="jpa_overview_query_named"/> respectively.
</para>
<note>
<para>
OpenJPA defines many useful annotations beyond the standard set. See
-<xref linkend="ref_guide_meta_jpa"></xref> and
-<xref linkend="ref_guide_meta_ext"></xref>
+<xref linkend="ref_guide_meta_jpa"/> and
+<xref linkend="ref_guide_meta_ext"/>
in the Reference Guide for details. There are currently no XML equivalents for
these extension annotations.
</para>
@@ -91,8 +91,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 553 x 580 (see README) -->
- <imagedata fileref="img/jpa-meta-model.png" width="369">
- </imagedata>
+ <imagedata fileref="img/jpa-meta-model.png" width="369"/>
+
</imageobject>
</mediaobject>
<para>
@@ -169,7 +169,7 @@
<para>
<literal>access</literal>: The access type to use for the class. Must either be
<literal>FIELD</literal> or <literal>PROPERTY</literal>. For details on access
-types, see <xref linkend="jpa_overview_meta_field"></xref>.
+types, see <xref linkend="jpa_overview_meta_field"/>.
</para>
</listitem>
</itemizedlist>
@@ -177,7 +177,7 @@
<para>
OpenJPA uses a process called <emphasis>enhancement</emphasis> to modify the
bytecode of entities for transparent lazy loading and immediate dirty tracking.
-See <xref linkend="ref_guide_pc_enhance"></xref> in the Reference Guide for
+See <xref linkend="ref_guide_pc_enhance"/> in the Reference Guide for
details on enhancement.
</para>
</note>
@@ -208,7 +208,7 @@
</secondary>
</indexterm>
<para>
-As we discussed in <xref linkend="jpa_overview_pc_identitycls"></xref>,
+As we discussed in <xref linkend="jpa_overview_pc_identitycls"/>,
entities with multiple identity fields must use an <emphasis> identity class
</emphasis> to encapsulate their persistent identity. The <classname>IdClass
</classname> annotation specifies this class. It accepts a single <classname>
@@ -275,7 +275,7 @@
<para>
<literal>access</literal>: The access type to use for the class. Must either be
<literal>FIELD</literal> or <literal>PROPERTY</literal>. For details on access
-types, see <xref linkend="jpa_overview_meta_field"></xref>.
+types, see <xref linkend="jpa_overview_meta_field"/>.
</para>
</listitem>
</itemizedlist>
@@ -335,7 +335,7 @@
<para>
<literal>access</literal>: The access type to use for the class. Must either be
<literal>FIELD</literal> or <literal>PROPERTY</literal>. For details on access
-types, see <xref linkend="jpa_overview_meta_field"></xref>.
+types, see <xref linkend="jpa_overview_meta_field"/>.
</para>
</listitem>
</itemizedlist>
@@ -388,7 +388,7 @@
EntityListeners</classname> annotation. This value of this annotation is an
array of the listener <classname>Class</classname> es for the entity. The
equivalent XML element is <literal>entity-listeners</literal>. For more details
-on entity listeners, see <xref linkend="jpa_overview_pc_callbacks"></xref>.
+on entity listeners, see <xref linkend="jpa_overview_pc_callbacks"/>.
</para>
</section>
<section id="jpa_overview_meta_classex">
@@ -706,7 +706,7 @@
<para>
Annotate your simple identity fields with <classname>Id</classname>. This
annotation has no properties. We explore entity identity and identity fields in
-<xref linkend="jpa_overview_pc_id"></xref>.
+<xref linkend="jpa_overview_pc_id"/>.
</para>
<para>
The equivalent XML element is <literal>id</literal>. It has one required
@@ -791,7 +791,7 @@
<para>
<literal>String generator</literal>: The name of a generator defined in mapping
metadata. We show you how to define named generators in
-<xref linkend="jpa_overview_mapping_sequence"></xref>. If the <classname>
+<xref linkend="jpa_overview_mapping_sequence"/>. If the <classname>
GenerationType</classname> is set but this property is unset, the JPA
implementation uses appropriate defaults for the selected generation type.
</para>
@@ -821,7 +821,7 @@
OpenJPA allows you to use the <classname>GeneratedValue</classname> annotation
on any field, not just identity fields. Before using the <literal>IDENTITY
</literal> generation strategy, however, read
-<xref linkend="ref_guide_pc_oid_pkgen_autoinc"></xref> in the Reference Guide.
+<xref linkend="ref_guide_pc_oid_pkgen_autoinc"/> in the Reference Guide.
</para>
<para>
OpenJPA also offers two additional generator strategies for non-numeric fields,
@@ -910,7 +910,7 @@
field. The type of a field annotated with <classname>EmbeddedId</classname> must
be an embeddable entity class. The fields of this embeddable class are
considered the identity values of the owning entity. We explore entity identity
-and identity fields in <xref linkend="jpa_overview_pc_id"></xref>.
+and identity fields in <xref linkend="jpa_overview_pc_id"/>.
</para>
<para>
The <classname>EmbeddedId</classname> annotation has no properties.
@@ -954,7 +954,7 @@
</indexterm>
<para>
Use the <classname>Version</classname> annotation to designate a version field.
-<xref linkend="jpa_overview_pc_version"></xref> explained the importance of
+<xref linkend="jpa_overview_pc_version"/> explained the importance of
version fields to JPA. This is a marker annotation; it has no properties.
</para>
<para>
@@ -1098,7 +1098,7 @@
<para>
With a mix of eager and lazily-loaded fields, you can ensure that commonly-used
fields load efficiently, and that other state loads transparently when accessed.
-As you will see in <xref linkend="jpa_overview_emfactory_perscontext"></xref>,
+As you will see in <xref linkend="jpa_overview_emfactory_perscontext"/>,
you can also use eager fetching to ensure that entites have all needed data
loaded before they become <emphasis>detached</emphasis> at the end of a
persistence context.
@@ -1107,11 +1107,11 @@
<para>
OpenJPA can lazy-load any field type. OpenJPA also allows you to dynamically
change which fields are eagerly or lazily loaded at runtime. See
-<xref linkend="ref_guide_fetch"></xref> in the Reference Guide for details.
+<xref linkend="ref_guide_fetch"/> in the Reference Guide for details.
</para>
<para>
The Reference Guide details OpenJPA's eager fetching behavior in
-<xref linkend="ref_guide_perfpack_eager"></xref>.
+<xref linkend="ref_guide_perfpack_eager"/>.
</para>
</note>
</section>
@@ -1218,7 +1218,7 @@
<literal>FetchType fetch</literal>: Whether to load the field eagerly (
<literal>FetchType.EAGER</literal>) or lazily ( <literal>FetchType.LAZY
</literal> ). Defaults to <literal>FetchType.EAGER</literal>. See
-<xref linkend="jpa_overview_meta_fetch"></xref> above for details on fetch
+<xref linkend="jpa_overview_meta_fetch"/> above for details on fetch
types.
</para>
</listitem>
@@ -1278,7 +1278,7 @@
</indexterm>
<para>
We introduce the JPA <classname>EntityManager</classname> in
-<xref linkend="jpa_overview_em"></xref>. The <classname>EntityManager
+<xref linkend="jpa_overview_em"/>. The <classname>EntityManager
</classname> has APIs to persist new entities, remove (delete) existing
entities, refresh entity state from the datastore, and merge <emphasis> detached
</emphasis> entity state back into the persistence context. We explore all of
@@ -1424,7 +1424,7 @@
<para>
<literal>CascadeType[] cascade</literal>: Array of enum values defining cascade
behavior for the collection elements. We explore cascades above in
-<xref linkend="jpa_overview_meta_cascade"></xref>. Defaults to an empty array.
+<xref linkend="jpa_overview_meta_cascade"/>. Defaults to an empty array.
</para>
</listitem>
<listitem>
@@ -1432,7 +1432,7 @@
<literal>FetchType fetch</literal>: Whether to load the field eagerly (
<literal>FetchType.EAGER</literal>) or lazily ( <literal>FetchType.LAZY
</literal> ). Defaults to <literal>FetchType.LAZY</literal>. See
-<xref linkend="jpa_overview_meta_fetch"></xref> above for details on fetch
+<xref linkend="jpa_overview_meta_fetch"/> above for details on fetch
types.
</para>
</listitem>
@@ -1462,7 +1462,7 @@
<listitem>
<para>
<literal>mapped-by</literal>: The name of the field or property that owns the
-relation. See <xref linkend="jpa_overview_meta_field"></xref>.
+relation. See <xref linkend="jpa_overview_meta_field"/>.
</para>
</listitem>
</itemizedlist>
@@ -1519,7 +1519,7 @@
Magazine.publisher</literal>, but inverses it. In fact, it is illegal to
specify any additional mapping information when you use the <literal>mappedBy
</literal> property. All mapping information is read from the referenced field.
-We explore mapping in depth in <xref linkend="jpa_overview_mapping"></xref>.
+We explore mapping in depth in <xref linkend="jpa_overview_mapping"/>.
</para>
</listitem>
<listitem>
@@ -1547,7 +1547,7 @@
<para>
You can configure OpenJPA to automatically synchronize both sides of a
bidirectional relation, or to perform various actions when it detects
-inconsistent relations. See <xref linkend="ref_guide_inverses"></xref> in the
+inconsistent relations. See <xref linkend="ref_guide_inverses"/> in the
Reference Guide for details.
</para>
</note>
@@ -1602,7 +1602,7 @@
<para>
<literal>String mappedBy</literal>: Names the field in the related entity that
maps this bidirectional relation. We explain bidirectional relations in
-<xref linkend="jpa_overview_meta_mappedby"></xref> above. Leaving this property
+<xref linkend="jpa_overview_meta_mappedby"/> above. Leaving this property
unset signals that this is a standard unidirectional relation.
</para>
</listitem>
@@ -1610,7 +1610,7 @@
<para>
<literal>CascadeType[] cascade</literal>: Array of enum values defining cascade
behavior for this field. We explore cascades in
-<xref linkend="jpa_overview_meta_cascade"></xref> above. Defaults to an empty
+<xref linkend="jpa_overview_meta_cascade"/> above. Defaults to an empty
array.
</para>
</listitem>
@@ -1619,7 +1619,7 @@
<literal>FetchType fetch</literal>: Whether to load the field eagerly (
<literal>FetchType.EAGER</literal>) or lazily ( <literal>FetchType.LAZY
</literal> ). Defaults to <literal>FetchType.EAGER</literal>. See
-<xref linkend="jpa_overview_meta_fetch"></xref> above for details on fetch
+<xref linkend="jpa_overview_meta_fetch"/> above for details on fetch
types.
</para>
</listitem>
@@ -1656,7 +1656,7 @@
<listitem>
<para>
<literal>mapped-by</literal>: The field that owns the relation. See
-<xref linkend="jpa_overview_meta_field"></xref>.
+<xref linkend="jpa_overview_meta_field"/>.
</para>
</listitem>
</itemizedlist>
@@ -1718,7 +1718,7 @@
<para>
<literal>String mappedBy</literal>: Names the many to many field in the related
entity that maps this bidirectional relation. We explain bidirectional relations
-in <xref linkend="jpa_overview_meta_mappedby"></xref> above. Leaving this
+in <xref linkend="jpa_overview_meta_mappedby"/> above. Leaving this
property unset signals that this is a standard unidirectional relation.
</para>
</listitem>
@@ -1726,7 +1726,7 @@
<para>
<literal>CascadeType[] cascade</literal>: Array of enum values defining cascade
behavior for the collection elements. We explore cascades above in
-<xref linkend="jpa_overview_meta_cascade"></xref>. Defaults to an empty array.
+<xref linkend="jpa_overview_meta_cascade"/>. Defaults to an empty array.
</para>
</listitem>
<listitem>
@@ -1734,7 +1734,7 @@
<literal>FetchType fetch</literal>: Whether to load the field eagerly (
<literal>FetchType.EAGER</literal>) or lazily ( <literal>FetchType.LAZY
</literal> ). Defaults to <literal>FetchType.LAZY</literal>. See
-<xref linkend="jpa_overview_meta_fetch"></xref> above for details on fetch
+<xref linkend="jpa_overview_meta_fetch"/> above for details on fetch
types.
</para>
</listitem>
@@ -1764,7 +1764,7 @@
<listitem>
<para>
<literal>mapped-by</literal>: The field that owns the relation. See
-<xref linkend="jpa_overview_meta_field"></xref>.
+<xref linkend="jpa_overview_meta_field"/>.
</para>
</listitem>
</itemizedlist>
@@ -1825,8 +1825,8 @@
</para>
<note>
<para>
-OpenJPA expands the available ordering syntax. See <xref linkend="order-by">
-</xref> in the Reference Guide for details.
+OpenJPA expands the available ordering syntax. See <xref linkend="order-by"/>
+ in the Reference Guide for details.
</para>
</note>
</section>
@@ -1966,7 +1966,7 @@
<para>
We present the complete XML schema below. Many of the elements relate to
object/relational mapping rather than metadata; these elements are discussed in
-<xref linkend="jpa_overview_mapping"></xref>.
+<xref linkend="jpa_overview_mapping"/>.
</para>
<programlisting>
<?xml version="1.0" encoding="UTF-8"?>
@@ -3807,7 +3807,7 @@
</programlisting>
</example>
<para>
-<xref linkend="jpa_overview_mapping"></xref> will show you how to map your
+<xref linkend="jpa_overview_mapping"/> will show you how to map your
persistent classes to the datastore using additional annotations and XML markup.
First, however, we turn to the JPA runtime APIs.
</para>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_pc.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_pc.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_pc.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_pc.xml Wed Sep 6 09:35:03 2006
@@ -163,7 +163,7 @@
<para>
OpenJPA's <emphasis>enhancer</emphasis> will automatically add a protected
no-arg constructor to your class when required. Therefore, this restriction does
-not apply when using OpenJPA. See <xref linkend="ref_guide_pc_enhance"></xref>
+not apply when using OpenJPA. See <xref linkend="ref_guide_pc_enhance"/>
of the Reference Guide for details.
</para>
</note>
@@ -208,14 +208,14 @@
Magazine</classname> class, <literal>isbn</literal> and <literal>title</literal>
are identity fields, because no two magazine records in the datastore can have
the same <literal>isbn</literal> and <literal>title</literal> values.
-<xref linkend="jpa_overview_meta_id"></xref> will show you how to denote your
-identity fields in JPA metadata. <xref linkend="jpa_overview_pc_identity">
-</xref> below examines persistent identity.
+<xref linkend="jpa_overview_meta_id"/> will show you how to denote your
+identity fields in JPA metadata. <xref linkend="jpa_overview_pc_identity"/>
+ below examines persistent identity.
</para>
<note>
<para>
OpenJPA fully supports identity fields, but does not require them. See
-<xref linkend="ref_guide_pc_oid"></xref> of the Reference Guide for details.
+<xref linkend="ref_guide_pc_oid"/> of the Reference Guide for details.
</para>
</note>
</section>
@@ -251,7 +251,7 @@
The version field is not required, but without one concurrent threads or
processes might succeed in making conflicting changes to the same record at the
same time. This is unacceptable to most applications.
-<xref linkend="jpa_overview_meta_version"></xref> shows you how to designate a
+<xref linkend="jpa_overview_meta_version"/> shows you how to designate a
version field in JPA metadata.
</para>
<para>
@@ -265,7 +265,7 @@
OpenJPA fully supports version fields, but does not require them for concurrency
detection. OpenJPA can maintain surrogate version values or use state
comparisons to detect concurrent modifications. See
-<xref linkend="ref_guide_mapping_jpa"></xref> in the Reference Guide.
+<xref linkend="ref_guide_mapping_jpa"/> in the Reference Guide.
</para>
</note>
</section>
@@ -316,7 +316,7 @@
<listitem>
<para>
All classes in an inheritance tree must use the same identity type. We cover
-entity identity in <xref linkend="jpa_overview_pc_identity"></xref>.
+entity identity in <xref linkend="jpa_overview_pc_identity"/>.
</para>
</listitem>
</itemizedlist>
@@ -555,7 +555,7 @@
</seealso>
</indexterm>
Most JPA implementations also have support for persisting serializable values as
-binary data in the datastore. <xref linkend="jpa_overview_meta"></xref> has more
+binary data in the datastore. <xref linkend="jpa_overview_meta"/> has more
information on persisting serializable types.
</para>
<note>
@@ -726,7 +726,7 @@
</seealso>
</indexterm>
If you are dealing with a single persistence context (see
-<xref linkend="jpa_overview_emfactory_perscontext"></xref> ), then you do not
+<xref linkend="jpa_overview_emfactory_perscontext"/> ), then you do not
have to compare identity fields to test whether two entity references represent
the same state in the datastore. There is a much easier way: the <literal>==
</literal> operator. JPA requires that each persistence context maintain only
@@ -811,7 +811,7 @@
All entity classes related by inheritance must use the same identity class, or
else each entity class must have its own identity class whose inheritance
hierarchy mirrors the inheritance hierarchy of the owning entity classes (see
-<xref linkend="jpa_overview_pc_identity_hierarchy"></xref> ).
+<xref linkend="jpa_overview_pc_identity_hierarchy"/> ).
</para>
</listitem>
</itemizedlist>
@@ -820,7 +820,7 @@
Though you may still create identity classes by hand, OpenJPA provides the
<classname>appidtool</classname> to automatically generate proper identity
classes based on your identity fields. See
-<xref linkend="ref_guide_pc_oid_application"></xref> of the Reference Guide.
+<xref linkend="ref_guide_pc_oid_application"/> of the Reference Guide.
</para>
</note>
<example id="jpa_overview_pc_identity_appidcode">
@@ -905,8 +905,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 320 x 267 (see README) -->
- <imagedata fileref="img/appid-hierarchy.png" width="213px">
- </imagedata>
+ <imagedata fileref="img/appid-hierarchy.png" width="213px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -1226,7 +1226,7 @@
<note>
<para>
We fully explore persistence metadata annotations and XML in
-<xref linkend="jpa_overview_meta"></xref>.
+<xref linkend="jpa_overview_meta"/>.
</para>
</note>
</section>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_persistence.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_persistence.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_persistence.xml Wed Sep 6 09:35:03 2006
@@ -34,8 +34,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 427 x 121 (see README) -->
- <imagedata fileref="img/persistence.png" width="285px">
- </imagedata>
+ <imagedata fileref="img/persistence.png" width="285px"/>
+
</imageobject>
</mediaobject>
<note>
@@ -181,7 +181,7 @@
</para>
<note>
<para>
-The Reference Guide's <xref linkend="ref_guide_conf"></xref> describes OpenJPA's
+The Reference Guide's <xref linkend="ref_guide_conf"/> describes OpenJPA's
configuration properties.
</para>
</note>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_query.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_query.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_query.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_query.xml Wed Sep 6 09:35:03 2006
@@ -21,8 +21,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 292 x 265 (see README) -->
- <imagedata fileref="img/jpa-query.png" width="195px">
- </imagedata>
+ <imagedata fileref="img/jpa-query.png" width="195px"/>
+
</imageobject>
</mediaobject>
<para>
@@ -33,8 +33,8 @@
</para>
<para>
The API for executing JPQL queries will be discussed in
-<xref linkend="jpa_query_api"></xref>, and a full language reference will be
-covered in <xref linkend="jpa_langref"></xref>.
+<xref linkend="jpa_query_api"/>, and a full language reference will be
+covered in <xref linkend="jpa_langref"/>.
</para>
<section id="jpa_query_api">
<title>
@@ -363,7 +363,7 @@
<para>
<note><para> Specifying the <literal>join fetch</literal> declaration is
functionally equivalent to adding the fields to the Query's <classname>
-FetchConfiguration</classname>. See <xref linkend="ref_guide_fetch"></xref>.
+FetchConfiguration</classname>. See <xref linkend="ref_guide_fetch"/>.
</para>
</note>
</para>
@@ -829,16 +829,16 @@
The complete BNF for JPQL is defined in
- <xref linkend="jpa_langref_bnf">
- </xref>
+ <xref linkend="jpa_langref_bnf"/>
+
.
Any JPQL statement may be constructed
dynamically or may be statically defined in a metadata annotation or
XML descriptor element. All statement types may have parameters, as
discussed in
- <xref linkend="jpa_langref_input_params">
- </xref>
+ <xref linkend="jpa_langref_input_params"/>
+
.
@@ -944,8 +944,8 @@
be used to restrict the scope of the update or delete operation. Update
and delete statements are described further in
- <xref linkend="jpa_langref_bulk_ops">
- </xref>
+ <xref linkend="jpa_langref_bulk_ops"/>
+
.
</para>
@@ -1757,7 +1757,7 @@
</para>
<para>
The <literal>GROUP BY</literal> and <literal>HAVING</literal> constructs are
-further discussed in <xref linkend="jpa_langref_group"></xref>.
+further discussed in <xref linkend="jpa_langref_group"/>.
</para>
</section>
<section id="jpa_langref_cond">
@@ -1802,7 +1802,7 @@
All identification variables used in the <literal>WHERE</literal> or <literal>
HAVING</literal> clause of a <literal>SELECT</literal> or <literal>DELETE
</literal> statement must be declared in the <literal>FROM</literal> clause, as
-described in <xref linkend="jpa_langref_from_vars"></xref>. The identification
+described in <xref linkend="jpa_langref_from_vars"/>. The identification
variables used in the <literal>WHERE</literal> clause of an <literal>UPDATE
</literal> statement must be declared in the <literal>UPDATE</literal> clause.
Identification variables are existentially quantified in the <literal>WHERE
@@ -1837,7 +1837,7 @@
<para>
Note that if an input parameter value is null, comparison operations or
arithmetic operations involving the input parameter will return an unknown
-value. See <xref linkend="jpa_langref_null_values"></xref>.
+value. See <xref linkend="jpa_langref_null_values"/>.
</para>
<section id="jpa_langref_pos_params">
<title>
@@ -1867,7 +1867,7 @@
<para>
A named parameter is an identifier that is prefixed by the ":" symbol. It
follows the rules for identifiers defined in
-<xref linkend="jpa_langref_from_identifiers"></xref>. Named parameters are case
+<xref linkend="jpa_langref_from_identifiers"/>. Named parameters are case
sensitive.
</para>
<para>
@@ -1924,7 +1924,7 @@
</para>
<para>
Aggregate functions can only be used in conditional expressions in a <literal>
-HAVING</literal> clause. See <xref linkend="jpa_langref_group"></xref>.
+HAVING</literal> clause. See <xref linkend="jpa_langref_group"/>.
</para>
</section>
<section id="jpa_langref_operators">
@@ -1983,7 +1983,7 @@
The BETWEEN expression <programlisting>x BETWEEN y AND z</programlisting> is
semantically equivalent to: <programlisting>y <= x AND x <= z
</programlisting> The rules for unknown and <literal>NULL</literal> values in
-comparison operations apply. See <xref linkend="jpa_langref_null_values"></xref>
+comparison operations apply. See <xref linkend="jpa_langref_null_values"/>
. Examples are: <programlisting>p.age BETWEEN 15 and 19</programlisting> is
equivalent to <programlisting>p.age >= 15 AND p.age <= 19</programlisting>
</para>
@@ -2016,12 +2016,12 @@
The state_field_path_expression must have a string, numeric, or enum value. The
literal and/or input_parameter values must be like the same abstract schema type
of the state_field_path_expression in type. (See
-<xref linkend="jpa_langref_equality"></xref> ).
+<xref linkend="jpa_langref_equality"/> ).
</para>
<para>
The results of the subquery must be like the same abstract schema type of the
state_field_path_expression in type. Subqueries are discussed in
-<xref linkend="jpa_langref_subqueries"></xref>. Examples are: <programlisting>o.country IN ('UK', 'US', 'France')
+<xref linkend="jpa_langref_subqueries"/>. Examples are: <programlisting>o.country IN ('UK', 'US', 'France')
</programlisting> is true for UK and false for Peru, and is equivalent to the
expression: <programlisting>(o.country = 'UK') OR (o.country = 'US') OR (o.country = ' France')
</programlisting> In the following expression: <programlisting>o.country NOT IN ('UK', 'US', 'France')
@@ -2203,7 +2203,7 @@
<literal>ALL</literal> or <literal>ANY</literal> conditional expressions are =,
<, <=, >, >=, <>. The result of the subquery must be like that
of the other argument to the comparison operator in type. See
-<xref linkend="jpa_langref_equality"></xref>. The syntax of an <literal>ALL
+<xref linkend="jpa_langref_equality"/>. The syntax of an <literal>ALL
</literal> or <literal>ANY</literal> expression is specified as follows:
<itemizedlist><listitem><para>all_or_any_expression ::= { ALL | ANY | SOME}
(subquery)
@@ -2534,7 +2534,7 @@
<listitem>
<para>
The result type of aggregate_expression is defined in section
-<xref linkend="jpa_langref_aggregates"></xref>.
+<xref linkend="jpa_langref_aggregates"/>.
</para>
</listitem>
<listitem>
@@ -2740,7 +2740,7 @@
</para>
<para>
The syntax of the <literal>WHERE</literal> clause is described in
-<xref linkend="jpa_langref_where"></xref>. A delete operation only applies to
+<xref linkend="jpa_langref_where"/>. A delete operation only applies to
entities of the specified class and its subclasses. It does not cascade to
related entities. The new_value specified for an update operation must be
compatible in type with the state-field to which it is assigned. Bulk update
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_sqlquery.xml Wed Sep 6 09:35:03 2006
@@ -60,7 +60,7 @@
continue using this low-level approach to SQL execution in your JPA
applications. However, JPA also supports executing SQL queries through the
<classname>javax.persistence.Query</classname> interface introduced in
-<xref linkend="jpa_overview_query"></xref>. Using a JPA SQL query, you can
+<xref linkend="jpa_overview_query"/>. Using a JPA SQL query, you can
retrieve either persistent objects or projections of column values. The
following sections detail each use.
</para>
@@ -181,8 +181,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 320 x 149 (see README) -->
- <imagedata fileref="img/sqlquery-model.png" width="213px">
- </imagedata>
+ <imagedata fileref="img/sqlquery-model.png" width="213px"/>
+
</imageobject>
</mediaobject>
<example id="jpa_overview_sqlquery_objex">
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_trans.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_trans.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_trans.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_trans.xml Wed Sep 6 09:35:03 2006
@@ -280,9 +280,9 @@
OpenJPA uses optimistic semantics by default, but supports both optimistic and
datastore transactions. OpenJPA also offers advanced locking and versioning APIs
for fine-grained control over database resource allocation and object
-versioning. See <xref linkend="ref_guide_locking"></xref> and
-<xref linkend="ref_guide_lock_groups"></xref> of the Reference Guide for details
-on locking. <xref linkend="jpa_overview_meta_version"></xref>
+versioning. See <xref linkend="ref_guide_locking"/> and
+<xref linkend="ref_guide_lock_groups"/> of the Reference Guide for details
+on locking. <xref linkend="jpa_overview_meta_version"/>
of this document covers standard object versioning, while
<xref linkend="ref_guide_mapping_jpa"/> of the Reference Guide discusses
additional versioning strategies available in OpenJPA.
@@ -304,8 +304,8 @@
<mediaobject>
<imageobject>
<!-- PNG image data, 193 x 157 (see README) -->
- <imagedata fileref="img/jpa-transaction.png" width="129px">
- </imagedata>
+ <imagedata fileref="img/jpa-transaction.png" width="129px"/>
+
</imageobject>
</mediaobject>
<para>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_why.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_why.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_why.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_why.xml Wed Sep 6 09:35:03 2006
@@ -24,22 +24,14 @@
Persistence Mechanisms
</title>
<tgroup cols="8" align="left" colsep="1" rowsep="1">
- <colspec colname="sup">
- </colspec>
- <colspec colname="ser">
- </colspec>
- <colspec colname="jdbc">
- </colspec>
- <colspec colname="or">
- </colspec>
- <colspec colname="objdb">
- </colspec>
- <colspec colname="ejb2">
- </colspec>
- <colspec colname="jdo">
- </colspec>
- <colspec colname="jpa">
- </colspec>
+ <colspec colname="sup"/>
+ <colspec colname="ser"/>
+ <colspec colname="jdbc"/>
+ <colspec colname="or"/>
+ <colspec colname="objdb"/>
+ <colspec colname="ejb2"/>
+ <colspec colname="jdo"/>
+ <colspec colname="jpa"/>
<thead>
<row>
<entry colname="sup">
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_tutorials.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_tutorials.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_tutorials.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_tutorials.xml Wed Sep 6 09:35:03 2006
@@ -84,7 +84,7 @@
tutorial.persistence.AnimalMaintenance</classname></ulink>: Provides some
utility methods for examining and manipulating the animals stored in the
database. We will fill in method definitions in
-<xref linkend="jpa_tutorial_chapter3"></xref>.
+<xref linkend="jpa_tutorial_chapter3"/>.
</para>
</listitem>
<listitem>
@@ -105,16 +105,16 @@
<para>
<ulink url="../../../tutorial/persistence/Rabbit.java"><classname>
tutorial.persistence.Rabbit</classname></ulink>: Contains data and methods
-specific to rabbits. It will be used in <xref linkend="jpa_tutorial_chapter4">
-</xref>.
+specific to rabbits. It will be used in <xref linkend="jpa_tutorial_chapter4"/>
+.
</para>
</listitem>
<listitem>
<para>
<ulink url="../../../tutorial/persistence/Snake.java"><classname>
tutorial.persistence.Snake</classname></ulink>: Contains data and methods
-specific to snakes. It will be used in <xref linkend="jpa_tutorial_chapter5">
-</xref>.
+specific to snakes. It will be used in <xref linkend="jpa_tutorial_chapter5"/>
+.
</para>
</listitem>
<listitem>
@@ -172,8 +172,8 @@
</primary>
</indexterm>
<command>openjpac</command>: Runs the OpenJPA enhancer against the specified
-classes. More information is available in <xref linkend="ref_guide_pc_enhance">
-</xref> of the Reference Guide.
+classes. More information is available in <xref linkend="ref_guide_pc_enhance"/>
+ of the Reference Guide.
</para>
</listitem>
<listitem>
@@ -187,7 +187,7 @@
maintain the object-relational mappings and schema of all persistent classes in
a JDBC-compliant datastore. This functionality allows the underlying mappings
and schema to be easily kept up-to-date with the Java classes in the system. See
-<xref linkend="ref_guide_mapping"></xref> of the Reference Guide for more
+<xref linkend="ref_guide_mapping"/> of the Reference Guide for more
information.
</para>
</listitem>
@@ -257,8 +257,8 @@
</programlisting>
<para>
The annotations serve to map the class into the database. For more information
-on these and other annotations, see <xref linkend="jpa_overview_meta"></xref>
-and <xref linkend="jpa_overview_mapping"></xref>.
+on these and other annotations, see <xref linkend="jpa_overview_meta"/>
+and <xref linkend="jpa_overview_mapping"/>.
</para>
<orderedlist>
<listitem>
@@ -322,7 +322,7 @@
</programlisting>
<para>
The annotations serve to map the fields into the database. For more information
-on these and other annotations, see <xref linkend="jpa_overview_meta"></xref>.
+on these and other annotations, see <xref linkend="jpa_overview_meta"/>.
</para>
<orderedlist>
<listitem>
@@ -374,7 +374,7 @@
<para>
This step runs the OpenJPA enhancer on the <filename>Animal.java</filename> and
<filename>Dog.java</filename> files mentioned above. See
-<xref linkend="ref_guide_pc_enhance"></xref> of the Reference Guide for more
+<xref linkend="ref_guide_pc_enhance"/> of the Reference Guide for more
information on the enhancer, including how to use automatic runtime enhancement.
</para>
<note>
@@ -385,7 +385,7 @@
<filename>META-INF/openjpa.xml</filename>. Thus you can avoid passing the
<literal>-p</literal> argument to tools by using this configuration file name in
place of <filename>persistence.xml</filename>. See
-<xref linkend="ref_guide_conf"></xref> in the Reference Guide for details on
+<xref linkend="ref_guide_conf"/> in the Reference Guide for details on
OpenJPA configuration.
</para>
</note>
@@ -405,7 +405,7 @@
for any database that we do not support. For the sake of simplicity, this
tutorial only describes how to set up connectivity to a Hypersonic SQL database.
For more information on how to connect to a different database or how to add
-support for other databases, see <xref linkend="ref_guide_dbsetup"></xref> of
+support for other databases, see <xref linkend="ref_guide_dbsetup"/> of
the Reference Guide.
</para>
<orderedlist>
@@ -431,9 +431,9 @@
</para>
<para>
By default, JPA uses object-relational mapping information stored in annotations
-in your source files. <xref linkend="jpa_overview_mapping"></xref> of the JPA
+in your source files. <xref linkend="jpa_overview_mapping"/> of the JPA
Overview will help you understand mapping annotations. Additionally,
-<xref linkend="ref_guide_mapping"></xref> of the Reference Guide describes your
+<xref linkend="ref_guide_mapping"/> of the Reference Guide describes your
other mapping options in detail.
</para>
<para>
@@ -448,7 +448,7 @@
<para>
This will create a <filename>tmp.schema</filename> file with an XML
representation of the database schema. The XML should be self explanatory; see
-<xref linkend="ref_guide_schema_xml"></xref> of the Reference Guide for details.
+<xref linkend="ref_guide_schema_xml"/> of the Reference Guide for details.
You may delete the <filename>tmp.schema</filename> file before proceeding.
</para>
</listitem>
@@ -541,8 +541,8 @@
like an object oriented SQL dialect. The <literal>name</literal> and <literal>
price</literal> fields identified in the above queries map to the member fields
of those names in <classname> tutorial.persistence.Animal</classname>. More
-details on JPQL syntax is available in <xref linkend="jpa_overview_query">
-</xref> of the JPA Overview.
+details on JPQL syntax is available in <xref linkend="jpa_overview_query"/>
+ of the JPA Overview.
</para>
</listitem>
</orderedlist>
@@ -774,7 +774,7 @@
ID</literal> primary key column. Similarly, the <literal>inverseJoinColumns
</literal> attribute denotes the foreign key columns linking to the collection
elements (the children). For more details on the <literal>@JoinTable</literal>
-annotation, see <xref linkend="jpa_overview_mapping"></xref> of the JPA
+annotation, see <xref linkend="jpa_overview_mapping"/> of the JPA
Overview.
</para>
<para>
@@ -957,7 +957,7 @@
</para>
<para>
For more information on types of relations, see
-<xref linkend="jpa_overview_mapping_field"></xref> of the JPA Overview.
+<xref linkend="jpa_overview_mapping_field"/> of the JPA Overview.
</para>
<para>
Modify the <literal>toString (boolean)</literal> method to output the giTract
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/openjpa_intro.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/openjpa_intro.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/openjpa_intro.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/openjpa_intro.xml Wed Sep 6 09:35:03 2006
@@ -21,9 +21,9 @@
</para>
<para>
To quickly get started with JPA, you may want to begin at
-<xref linkend="jpa_tutorial"></xref>. If you would prefer to start with an
+<xref linkend="jpa_tutorial"/>. If you would prefer to start with an
introduction to the concepts of JPA, begin with
-<xref linkend="jpa_overview_intro"></xref>.
+<xref linkend="jpa_overview_intro"/>.
</para>
<section id="openjpa_intro_about">
<title>
Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_caching.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_caching.xml?view=diff&rev=440775&r1=440774&r2=440775
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_caching.xml (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_caching.xml Wed Sep 6 09:35:03 2006
@@ -44,10 +44,10 @@
accelerates three of these mechanisms. It does not provide any caching of large
result set relations or <classname>Extent</classname> iterators. If you find
yourself in need of higher-performance <classname>Extent</classname> iteration,
-see <xref linkend="ref_guide_cache_limits_extent"></xref>. <table><title>Data
+see <xref linkend="ref_guide_cache_limits_extent"/>. <table><title>Data
access methods</title><tgroup cols="2" align="left" colsep="1" rowsep="1">
-<colspec colname="access-method"></colspec><colspec colname="cacheable">
-</colspec><thead><row><entry colname="access-method">Access method</entry>
+<colspec colname="access-method"/><colspec colname="cacheable"/>
+<thead><row><entry colname="access-method">Access method</entry>
<entry colname="cacheable">Uses cache</entry></row></thead><tbody><row>
<entry colname="access-method"> Standard relation traversal</entry>
<entry colname="cacheable">Yes</entry></row><row>
@@ -67,9 +67,9 @@
<para>
OpenJPA's data cache can in both single-JVM and multi-JVM environments.
Multi-JVM caching is achieved through the use of the distributed event
-notification framework described in <xref linkend="ref_guide_event"></xref>, or
+notification framework described in <xref linkend="ref_guide_event"/>, or
through one of OpenJPA's integrations with third-party distributed caches (see
-<xref linkend="ref_guide_datacacheintegrations"></xref> ).
+<xref linkend="ref_guide_datacacheintegrations"/> ).
</para>
<para>
The single JVM mode of operation maintains and shares a data cache across all
@@ -104,8 +104,8 @@
set the <link linkend="openjpa.RemoteCommitProvider"><literal>
openjpa.RemoteCommitProvider</literal></link> property appropriately, or
integrate OpenJPA with a third-party caching solution. Remote commit providers
-are described in <xref linkend="ref_guide_event"></xref>.
-<xref linkend="ref_guide_datacacheintegrations"></xref> enumerates supported
+are described in <xref linkend="ref_guide_event"/>.
+<xref linkend="ref_guide_datacacheintegrations"/> enumerates supported
third-party caching solutions.
</para>
<para>
@@ -283,7 +283,7 @@
data caching framework. While you may use this framework directly (see its
<ulink url="../apidocs/org/apache/openjpa/datacache/package-summary.html">
Javadoc</ulink> for details), its APIs are meant primarily for service
-providers. In fact, <xref linkend="ref_guide_cache_extension"></xref> below has
+providers. In fact, <xref linkend="ref_guide_cache_extension"/> below has
tips on how to use this package to extend OpenJPA's caching service yourself.
</para>
<para>
@@ -383,7 +383,7 @@
See the <classname>StoreCache</classname>
<ulink url="../../api/openjpa/persistence/StoreCache.html">Javadoc</ulink> for
information on additional functionality it provides. Also,
-<xref linkend="ref_guide_runtime"></xref> discusses OpenJPA's other extensions
+<xref linkend="ref_guide_runtime"/> discusses OpenJPA's other extensions
to the standard set of JPA runtime interfaces.
</para>
<para>
@@ -964,8 +964,8 @@
</classname> directly. If you want to implement a distributed cache that uses an
unsupported method for communications, create an implementation of <classname>
org.apache.openjpa.event.RemoteCommitProvider</classname>. This process is
-described in greater detail in <xref linkend="ref_guide_event_customization">
-</xref>.
+described in greater detail in <xref linkend="ref_guide_event_customization"/>
+.
</para>
<para>
The query cache is just as easy to extend. Add functionality by extending the
@@ -994,7 +994,7 @@
Invoking <methodname>OpenJPAEntityManager.evict</methodname><emphasis>does not
</emphasis> result in the corresponding data being dropped from the data cache,
unless you have set the proper configuration options as explained above (see
-<xref linkend="ref_guide_cache_pmevict"></xref> ). Other methods related to the
+<xref linkend="ref_guide_cache_pmevict"/> ). Other methods related to the
<classname>EntityManager</classname> cache also do not effect the data cache.
</para>
<para>
@@ -1106,8 +1106,8 @@
cached thereafter. You can control the compilation cache through the
<link linkend="openjpa.QueryCompilationCache"><literal>
openjpa.QueryCompilationCache</literal></link> configuration property. This
-property accepts a plugin string (see <xref linkend="ref_guide_conf_plugins">
-</xref>) describing the <classname>Map</classname> used to associate query
+property accepts a plugin string (see <xref linkend="ref_guide_conf_plugins"/>
+) describing the <classname>Map</classname> used to associate query
strings and their parsed form. This property accepts the following aliases:
</para>
<table>
@@ -1115,12 +1115,12 @@
Pre-defined aliases
</title>
<tgroup cols="2" align="left" colsep="1" rowsep="1">
- <colspec colname="alias">
- </colspec>
- <colspec colname="value">
- </colspec>
- <colspec colname="notes">
- </colspec>
+ <colspec colname="alias"/>
+
+ <colspec colname="value"/>
+
+ <colspec colname="notes"/>
+
<thead>
<row>
<entry colname="alias">