From babda8d2186d065f2c4d5dfb5f2ec627960fe04a Mon Sep 17 00:00:00 2001 From: "Kevin W. Sutter" Date: Thu, 18 Feb 2010 21:47:37 +0000 Subject: [PATCH] OPENJPA-1520. Doc updates to point at appropriate javase 6 and javaee 6 api urls (instead of javase/ee 5 urls). git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@911608 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/doc/manual/jpa_overview_arch.xml | 2 +- openjpa-project/src/doc/manual/jpa_overview_em.xml | 6 +++--- openjpa-project/src/doc/manual/jpa_overview_pc.xml | 14 +++++++------- .../src/doc/manual/jpa_overview_persistence.xml | 4 ++-- .../src/doc/manual/jpa_overview_query.xml | 4 ++-- openjpa-project/src/doc/manual/jpa_resources.xml | 2 +- .../src/doc/manual/ref_guide_caching.xml | 4 ++-- .../src/doc/manual/ref_guide_deploy.xml | 2 +- .../src/doc/manual/ref_guide_runtime.xml | 2 +- openjpa-project/src/doc/manual/ref_guide_slice.xml | 12 ++++++------ 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/openjpa-project/src/doc/manual/jpa_overview_arch.xml b/openjpa-project/src/doc/manual/jpa_overview_arch.xml index 005a7edc7..47fe558e3 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_arch.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_arch.xml @@ -299,7 +299,7 @@ appropriate, most notably IllegalArgumentExceptions and IllegalStateExceptions. The specification also provides a few JPA-specific exceptions in the javax.persistence package. These exceptions should be self-explanatory. See the -Javadoc for +Javadoc for additional details on JPA exceptions. diff --git a/openjpa-project/src/doc/manual/jpa_overview_em.xml b/openjpa-project/src/doc/manual/jpa_overview_em.xml index 1ac07958e..a2444e29d 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_em.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_em.xml @@ -37,7 +37,7 @@ The diagram above presents an overview of the EntityManager interface. For a complete treatment of the EntityManager API, see the - + Javadoc documentation. Methods whose parameter signatures consist of an ellipsis (...) are overloaded to take multiple parameter types. @@ -515,7 +515,7 @@ public void lock(Object entity, LockModeType mode); This method locks the given entity using the named mode. The - + javax.persistence.LockModeType enum defines two modes: @@ -916,7 +916,7 @@ The EntityManager's FlushMode property controls whether to flush transactional changes before executing queries. This allows the query results to take into account changes you have made during the current transaction. Available - + javax.persistence.FlushModeType constants are: diff --git a/openjpa-project/src/doc/manual/jpa_overview_pc.xml b/openjpa-project/src/doc/manual/jpa_overview_pc.xml index a671e6559..b311f09f3 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_pc.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_pc.xml @@ -1069,7 +1069,7 @@ lifecycle events and their corresponding method markers are: lifecycle callbacks - + PrePersist: Methods marked with this annotation will be invoked before an object is persisted. This could be used for assigning primary key values to persistent objects. This is equivalent to the XML element @@ -1086,7 +1086,7 @@ tag pre-persist. lifecycle callbacks - + PostPersist: Methods marked with this annotation will be invoked after an object has transitioned to the persistent state. You might want to use such methods to update a screen after a new row is added. This @@ -1103,7 +1103,7 @@ is equivalent to the XML element tag post-persist. lifecycle callbacks - + PostLoad: Methods marked with this annotation will be invoked after all eagerly fetched fields of your class have been loaded from the datastore. No other persistent fields can be accessed in this method. @@ -1125,7 +1125,7 @@ data structure. lifecycle callbacks - + PreUpdate: Methods marked with this annotation will be invoked just the persistent values in your objects are flushed to the datastore. This is equivalent to the XML element tag @@ -1149,7 +1149,7 @@ persistent fields with information cached in non-persistent data. lifecycle callbacks - + PostUpdate: Methods marked with this annotation will be invoked after changes to a given instance have been stored to the datastore. This is useful for clearing stale data cached at the application @@ -1166,7 +1166,7 @@ layer. This is equivalent to the XML element tag post-update. lifecycle callbacks - + PreRemove: Methods marked with this annotation will be invoked before an object transactions to the deleted state. Access to persistent fields is valid within this method. You might use this method to @@ -1185,7 +1185,7 @@ pre-remove. lifecycle callbacks - + PostRemove: Methods marked with this annotation will be invoked after an object has been marked as to be deleted. This is equivalent to the XML element tag post-remove. diff --git a/openjpa-project/src/doc/manual/jpa_overview_persistence.xml b/openjpa-project/src/doc/manual/jpa_overview_persistence.xml index ee41c98ee..bfa9abfe3 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_persistence.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_persistence.xml @@ -68,7 +68,7 @@ additional utility methods. Within a container, you will typically use injection to access an EntityManagerFactory. Applications operating outside of a container, however, can use the - + Persistence class to obtain EntityManagerFactory objects in a vendor-neutral fashion. @@ -456,7 +456,7 @@ transaction management. provider: If you are using a third-party JPA vendor, this element names its implementation of the - + PersistenceProvider bootstrapping interface. diff --git a/openjpa-project/src/doc/manual/jpa_overview_query.xml b/openjpa-project/src/doc/manual/jpa_overview_query.xml index f06532ac5..3844831ec 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_query.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_query.xml @@ -74,7 +74,7 @@ public Query createQuery(String jpql); The - + EntityManager.createQuery method creates a Query instance from a given JPQL string. @@ -83,7 +83,7 @@ public List getResultList(); Invoking - + Query.getResultList executes the query and returns a List containing the matching objects. The following example executes our Magazine query above: diff --git a/openjpa-project/src/doc/manual/jpa_resources.xml b/openjpa-project/src/doc/manual/jpa_resources.xml index c17923fdc..992164f2c 100644 --- a/openjpa-project/src/doc/manual/jpa_resources.xml +++ b/openjpa-project/src/doc/manual/jpa_resources.xml @@ -35,7 +35,7 @@ EJB 3 JSR page - + javax.persistence Javadoc diff --git a/openjpa-project/src/doc/manual/ref_guide_caching.xml b/openjpa-project/src/doc/manual/ref_guide_caching.xml index a1a901882..740f6038d 100644 --- a/openjpa-project/src/doc/manual/ref_guide_caching.xml +++ b/openjpa-project/src/doc/manual/ref_guide_caching.xml @@ -785,7 +785,7 @@ public void evictAll(); For JPA queries with parameters, set the desired parameter values into the - + Query instance before calling the above methods. @@ -829,7 +829,7 @@ public void unpin(Query q); For JPA queries with parameters, set the desired parameter values into the - + Query instance before calling the above methods. diff --git a/openjpa-project/src/doc/manual/ref_guide_deploy.xml b/openjpa-project/src/doc/manual/ref_guide_deploy.xml index 3bcf1de7e..e9a0dd18b 100644 --- a/openjpa-project/src/doc/manual/ref_guide_deploy.xml +++ b/openjpa-project/src/doc/manual/ref_guide_deploy.xml @@ -139,7 +139,7 @@ global transactions. You can override the global transaction mode setting when you obtain an EntityManager using the - + EntityManagerFactory's createEntityManager(Map props) method. Simply set the openjpa.TransactionMode key of the given Map diff --git a/openjpa-project/src/doc/manual/ref_guide_runtime.xml b/openjpa-project/src/doc/manual/ref_guide_runtime.xml index d4e5fd55b..cb8f5b7a9 100644 --- a/openjpa-project/src/doc/manual/ref_guide_runtime.xml +++ b/openjpa-project/src/doc/manual/ref_guide_runtime.xml @@ -658,7 +658,7 @@ Returns the level at which the given object is currently locked. In addition to the standard - + EntityManager.lock(Object, LockModeType) method, the diff --git a/openjpa-project/src/doc/manual/ref_guide_slice.xml b/openjpa-project/src/doc/manual/ref_guide_slice.xml index 63e31cae2..80031ce9e 100644 --- a/openjpa-project/src/doc/manual/ref_guide_slice.xml +++ b/openjpa-project/src/doc/manual/ref_guide_slice.xml @@ -534,7 +534,7 @@ the JDBC connection URL of a slice. for database operations such as query or flush on individual slices. The value of the property is a fully-qualified class name that implements - + java.util.concurrent.ExecutorService interface. Two pre-defined pools can be chosen via their aliases namely @@ -542,7 +542,7 @@ the JDBC connection URL of a slice. The pre-defined alias cached activates a - cached thread pool. + cached thread pool. A cached thread pool creates new threads as needed, but will reuse previously constructed threads when they are available. This pool is suitable in scenarios that execute many short-lived asynchronous tasks. @@ -552,23 +552,23 @@ the JDBC connection URL of a slice. The fixed alias activates a - fixed thread pool. + fixed thread pool. The fixed thread pool can be further parameterized with CorePoolSize, MaximumPoolSize, KeepAliveTime and RejectedExecutionHandler. The meaning of these parameters are described in - JavaDoc. + JavaDoc. The users can exercise finer control on thread pool behavior via these parameters. By default, the core pool size is 10, maximum pool size is also 10, keep alive time is 60 seconds and rejected execution is - aborted. + aborted. Both of the pre-defined aliases can be parameterized with a fully-qualified class name that implements - + java.util.concurrent.ThreadFactory interface.