diff --git a/openjpa-project/src/doc/manual/jpa_overview_arch.xml b/openjpa-project/src/doc/manual/jpa_overview_arch.xml
index 0cf3f3632..ec10f1947 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 <classname>IllegalArgumentException</classname>s and
 <classname>IllegalStateException</classname>s. The specification also provides
 a few JPA-specific exceptions in the <literal>javax.persistence</literal>
 package. These exceptions should be self-explanatory. See the
-<ulink url="http://java.sun.com/javaee/6/docs/api/">Javadoc</ulink> for
+<ulink url="http://download.oracle.com/javaee/6/api/">Javadoc</ulink> for
 additional details on JPA exceptions.
         </para>
         <note>
diff --git a/openjpa-project/src/doc/manual/jpa_overview_em.xml b/openjpa-project/src/doc/manual/jpa_overview_em.xml
index 9db822941..a207b9bfb 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 <classname>EntityManager
 </classname> interface. For a complete treatment of the <classname>
 EntityManager</classname> API, see the
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/EntityManager.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/EntityManager.html">
 Javadoc</ulink> documentation. Methods whose parameter signatures consist of 
 an ellipsis (...) are overloaded to take multiple parameter types.
     </para>
@@ -515,7 +515,7 @@ public void lock(Object entity, LockModeType mode);
             </seealso>
         </indexterm>
 This method locks the given entity using the named mode. The
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/LockModeType.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/LockModeType.html">
 <classname>javax.persistence.LockModeType</classname></ulink> enum defines two
 modes:
         </para>
@@ -916,7 +916,7 @@ The <classname>EntityManager</classname>'s <literal>FlushMode</literal> 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
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/FlushModeType.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/FlushModeType.html">
 <classname>javax.persistence.FlushModeType</classname></ulink> constants are:
         </para>
         <itemizedlist>
diff --git a/openjpa-project/src/doc/manual/jpa_overview_pc.xml b/openjpa-project/src/doc/manual/jpa_overview_pc.xml
index 9102345e0..effa3fc8a 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
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PrePersist.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PrePersist.html">
 <classname>PrePersist</classname></ulink>: 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 <literal>pre-persist</literal>.
                             lifecycle callbacks
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PostPersist.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PostPersist.html">
 <classname>PostPersist</classname></ulink>: 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 <literal>post-persist</literal>.
                             lifecycle callbacks
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PostLoad.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PostLoad.html">
 <classname>PostLoad</classname></ulink>: 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
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PreUpdate.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PreUpdate.html">
 <classname>PreUpdate</classname></ulink>: 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 <literal>
@@ -1149,7 +1149,7 @@ persistent fields with information cached in non-persistent data.
                             lifecycle callbacks
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PostUpdate.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PostUpdate.html">
 <classname>PostUpdate</classname></ulink>: 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 <literal>post-update</literal>.
                             lifecycle callbacks
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PreRemove.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PreRemove.html">
 <classname>PreRemove</classname></ulink>: 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</literal>.
                             lifecycle callbacks
                         </seealso>
                     </indexterm>
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/PostRemove.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/PostRemove.html">
 <classname>PostRemove</classname></ulink>: 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 <literal>post-remove</literal>.
diff --git a/openjpa-project/src/doc/manual/jpa_overview_persistence.xml b/openjpa-project/src/doc/manual/jpa_overview_persistence.xml
index bfa9abfe3..105d2cbed 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 <emphasis>injection</emphasis> to
 access an <classname>EntityManagerFactory</classname>. Applications operating
 outside of a container, however, can use the
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/Persistence.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/Persistence.html">
 <classname>Persistence</classname></ulink> class to obtain <classname>
 EntityManagerFactory</classname> objects in a vendor-neutral fashion.
     </para>
@@ -456,7 +456,7 @@ transaction management.
                 <para>
 <literal>provider</literal>: If you are using a third-party JPA vendor, this
 element names its implementation of the
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/spi/PersistenceProvider.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/spi/PersistenceProvider.html">
 <classname>PersistenceProvider</classname></ulink> bootstrapping interface.
                 </para>
                 <note>
diff --git a/openjpa-project/src/doc/manual/jpa_overview_query.xml b/openjpa-project/src/doc/manual/jpa_overview_query.xml
index 3457845ab..5c438f852 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);
 </programlisting>
             <para>
 The
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/EntityManager.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/EntityManager.html">
 <methodname>EntityManager.createQuery</methodname></ulink> method creates a
 <classname>Query</classname> instance from a given JPQL string.
             </para>
@@ -83,7 +83,7 @@ public List getResultList();
 </programlisting>
             <para>
 Invoking
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/Query.html#getResultList()">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/Query.html#getResultList()">
 <methodname>Query.getResultList</methodname></ulink> executes the query and
 returns a <classname>List</classname> containing the matching objects. The
 following example executes our <classname>Magazine</classname> query above:
diff --git a/openjpa-project/src/doc/manual/jpa_resources.xml b/openjpa-project/src/doc/manual/jpa_resources.xml
index 47f51109c..2eb8a6dec 100644
--- a/openjpa-project/src/doc/manual/jpa_resources.xml
+++ b/openjpa-project/src/doc/manual/jpa_resources.xml
@@ -35,7 +35,7 @@ Java Persistence 2.0 page</ulink>
         </listitem>
         <listitem>
             <para>
-<ulink url="http://java.sun.com/javaee/6/docs/api/index.html">
+<ulink url="http://download.oracle.com/javaee/6/api/index.html">
 javax.persistence Javadoc</ulink>
             </para>
         </listitem>
diff --git a/openjpa-project/src/doc/manual/ref_guide_caching.xml b/openjpa-project/src/doc/manual/ref_guide_caching.xml
index c1d596e6c..0ecbc1b49 100644
--- a/openjpa-project/src/doc/manual/ref_guide_caching.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_caching.xml
@@ -820,7 +820,7 @@ public void evictAll();
 </programlisting>
             <para>
 For JPA queries with parameters, set the desired parameter values into the
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/Query.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/Query.html">
 <classname>Query</classname></ulink> instance before calling the above methods.
             </para>
             <example id="ref_guide_cache_query_classchange">
@@ -864,7 +864,7 @@ public void unpin(Query q);
 </programlisting>
             <para>
 For JPA queries with parameters, set the desired parameter values into the
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/Query.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/Query.html">
 <classname>Query</classname></ulink> instance before calling the above methods.
             </para>
             <para>
diff --git a/openjpa-project/src/doc/manual/ref_guide_deploy.xml b/openjpa-project/src/doc/manual/ref_guide_deploy.xml
index 11ac262bf..2774b2566 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.
         <para>
 You can override the global transaction mode setting when you obtain an
 <classname>EntityManager</classname> using the 
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/EntityManagerFactory.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/EntityManagerFactory.html">
 <classname>EntityManagerFactory</classname></ulink>'s
 <methodname>createEntityManager(Map props)</methodname> method.  Simply set the
 <literal>openjpa.TransactionMode</literal> key of the given <classname>Map
diff --git a/openjpa-project/src/doc/manual/ref_guide_runtime.xml b/openjpa-project/src/doc/manual/ref_guide_runtime.xml
index 73ea9389f..17235d823 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.
             </para>
             <para>
 In addition to the standard
-<ulink url="http://java.sun.com/javaee/6/docs/api/javax/persistence/EntityManager.html">
+<ulink url="http://download.oracle.com/javaee/6/api/javax/persistence/EntityManager.html">
 <methodname>EntityManager.lock(Object, LockModeType)</methodname></ulink>
 method, the
 <ulink url="../javadoc/org/apache/openjpa/persistence/OpenJPAEntityManager.html">
diff --git a/openjpa-project/src/doc/manual/ref_guide_slice.xml b/openjpa-project/src/doc/manual/ref_guide_slice.xml
index 8ebd81070..bb00b5cd6 100644
--- a/openjpa-project/src/doc/manual/ref_guide_slice.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_slice.xml
@@ -601,7 +601,7 @@ the JDBC connection URL of a slice.
       This plug-in property determines the policy for transaction commit 
       across multiple slices. The value of this property is a fully-qualified 
       class name that implements 
-      <ulink url="http://java.sun.com/javaee/6/docs/api/javax/transaction/TransactionManager.html">
+      <ulink url="http://download.oracle.com/javaee/6/api/javax/transaction/TransactionManager.html">
       <classname>javax.transaction.TransactionManager</classname> 
       </ulink> interface. 
       </para>