openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r421741 [15/15] - in /incubator/openjpa/trunk: openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/ openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/ openjpa-kernel/src/main/java/org/apache/openjpa/ant/ openjpa-kernel/src...
Date Thu, 13 Jul 2006 23:45:02 GMT
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 /**
- * <p>Large result set field marker.</p>
+ * Large result set field marker.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataTag.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@
 /////////////////////////////////////////////////////////
 
 /**
- * <p>Set of metadata tags used in JPA.</p>
+ * Set of metadata tags used in JPA.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>Unique query returned no results.</p>
+ * Unique query returned no results.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>Unique query returned multipl results.</p>
+ * Unique query returned multipl results.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -31,7 +31,7 @@
 import org.apache.openjpa.lib.util.Closeable;
 
 /**
- * <p>Interface implemented by OpenJPA entity managers.</p>
+ * Interface implemented by OpenJPA entity managers.
  *
  * @since 4.0
  * @author Abe White
@@ -62,7 +62,7 @@
     /**
      * Return the connection retain mode for this entity manager.
      *
-     * @see    ConnectionRetainModes
+     * @see ConnectionRetainModes
      */
     public int getConnectionRetainMode();
 
@@ -78,13 +78,13 @@
 
     /**
      * Whether to check for a global transaction upon every managed,
-     * non-transactional operation.  Defaults to false.
+     * non-transactional operation. Defaults to false.
      */
     public boolean getSyncWithManagedTransactions();
 
     /**
      * Whether to check for a global transaction upon every managed,
-     * non-transactional operation.  Defaults to false.
+     * non-transactional operation. Defaults to false.
      */
     public void setSyncWithManagedTransactions(boolean resync);
 
@@ -161,14 +161,14 @@
     /**
      * Whether to restore an object's original state on rollback.
      *
-     * @see    RestoreState
+     * @see RestoreState
      */
     public int getRestoreState();
 
     /**
      * Whether to restore an object's original state on rollback.
      *
-     * @see    RestoreState
+     * @see RestoreState
      */
     public void setRestoreState(int restore);
 
@@ -186,7 +186,7 @@
      * Detach mode constant to determine which fields are part of the
      * detached graph.
      *
-     * @see    DetachState
+     * @see DetachState
      */
     public int getDetachState();
 
@@ -194,21 +194,21 @@
      * Detach mode constant to determine which fields are part of the
      * detached graph.
      *
-     * @see    DetachState
+     * @see DetachState
      */
     public void setDetachState(int mode);
 
     /**
      * Whether to clear state when entering a transaction.
      *
-     * @see    AutoClear
+     * @see AutoClear
      */
     public int getAutoClear();
 
     /**
      * Whether to clear state when entering a transaction.
      *
-     * @see    AutoClear
+     * @see AutoClear
      */
     public void setAutoClear(int clear);
 
@@ -276,7 +276,7 @@
     public void setLargeTransaction(boolean largeTransaction);
 
     /**
-     * Put the specified key-value pair into the map of user objects.  Use
+     * Put the specified key-value pair into the map of user objects. Use
      * a value of null to remove the key.
      */
     public Object putUserObject(Object key, Object val);
@@ -302,7 +302,7 @@
 
     /**
      * Register a listener for lifecycle-related events on the specified
-     * classes.  If the classes are null, all events will be propagated to
+     * classes. If the classes are null, all events will be propagated to
      * the listener.
      */
     public void addLifecycleListener(Object listener, Class... classes);
@@ -319,20 +319,20 @@
     /**
      * Return the objects with the given oids.
      *
-     * @param    oids    the oids of the objects to return
+     * @param oids the oids of the objects to return
      * @return the objects that were looked up, in the
      * same order as the oids parameter.
-     * @see    #find(Class,Object)
+     * @see #find(Class,Object)
      */
     public <T> T[] findAll(Class<T> cls, Object... oids);
 
     /**
      * Return the objects with the given oids.
      *
-     * @param    oids    the oids of the objects to return
+     * @param oids the oids of the objects to return
      * @return the objects that were looked up, in the
      * same order as the oids parameter.
-     * @see    #find(Class,Object)
+     * @see #find(Class,Object)
      */
     public <T> Collection<T> findAll(Class<T> cls, Collection oids);
 
@@ -340,7 +340,7 @@
      * Return the cached instance for the given oid/object, or null if not
      * cached.
      *
-     * @param    oid        the object's id
+     * @param oid the object's id
      * @return the cached object, or null if not cached
      */
     public <T> T findCached(Class<T> cls, Object oid);
@@ -357,29 +357,23 @@
 
     /**
      * Issue a commit and then start a new transaction. This is identical to:
-     * <pre>
-     * 	manager.commit ();
-     * 	manager.begin ();
-     * 	</pre>
-     * except that the entity manager's internal atomic lock is utilized,
+     * <pre> manager.commit (); manager.begin ();
+     * </pre> except that the entity manager's internal atomic lock is utilized,
      * so this method can be safely executed from multiple threads.
      *
-     * @see    #commit()
-     * @see    #begin()
+     * @see #commit()
+     * @see #begin()
      */
     public void commitAndResume();
 
     /**
      * Issue a rollback and then start a new transaction. This is identical to:
-     * <pre>
-     * 	manager.rollback ();
-     * 	manager.begin ();
-     * 	</pre>
-     * except that the entity manager's internal atomic lock is utilized,
+     * <pre> manager.rollback (); manager.begin ();
+     * </pre> except that the entity manager's internal atomic lock is utilized,
      * so this method can be safely executed from multiple threads.
      *
-     * @see    #rollback()
-     * @see    #begin()
+     * @see #rollback()
+     * @see #begin()
      */
     public void rollbackAndResume();
 
@@ -435,9 +429,9 @@
 
     /**
      * Validate the changes made in this transaction, reporting any optimistic
-     * violations, constraint violations, etc.  In a datastore transaction or
+     * violations, constraint violations, etc. In a datastore transaction or
      * a flushed optimistic transaction, this method will act just like
-     * {@link #flush()}.  In an optimistic transaction that has not yet begun a
+     * {@link #flush()}. In an optimistic transaction that has not yet begun a
      * datastore-level transaction, however, it will only report exceptions
      * that would occur on flush, without retaining any datastore resources.
      */
@@ -449,7 +443,7 @@
     public boolean isStoreActive();
 
     /**
-     * Begins a store transaction if one isn't already started.  The
+     * Begins a store transaction if one isn't already started. The
      * entity manager must already be in a logical transaction.
      */
     public void beginStore();
@@ -489,28 +483,28 @@
     public void removeAll(Collection pcs);
 
     /**
-     * Release the given object from management.  This operation is not
+     * Release the given object from management. This operation is not
      * recursive.
      */
     public void release(Object pc);
 
     /**
-     * Release the given object from management.  This operation is not
+     * Release the given object from management. This operation is not
      * recursive.
      */
     public void releaseAll(Object... pcs);
 
     /**
-     * Release the given objects from management.  This operation is not
+     * Release the given objects from management. This operation is not
      * recursive.
      */
     public void releaseAll(Collection pcs);
 
     /**
-     * Immediately load the given object's persistent fields.  One might
+     * Immediately load the given object's persistent fields. One might
      * use this action to make sure that an instance's fields are loaded
-     * before transitioning it to transient.  Note that this action is not
-     * recursive.  Any related objects that are loaded will not necessarily
+     * before transitioning it to transient. Note that this action is not
+     * recursive. Any related objects that are loaded will not necessarily
      * have their fields loaded.
      */
     public void retrieve(Object pc);
@@ -518,14 +512,14 @@
     /**
      * Retrieve the persistent state of the given objects.
      *
-     * @see    #retrieve
+     * @see #retrieve
      */
     public void retrieveAll(Object... pcs);
 
     /**
      * Retrieve the persistent state of the given objects.
      *
-     * @see    #retrieve
+     * @see #retrieve
      */
     public void retrieveAll(Collection pcs);
 
@@ -767,7 +761,7 @@
     //////////////
 
     /**
-     * Cancel all pending data store statements.  If statements are cancelled
+     * Cancel all pending data store statements. If statements are cancelled
      * while a flush is in progress, the transaction rollback only flag will
      * be set.
      *
@@ -852,7 +846,7 @@
      * {@link org.apache.openjpa.enhance.PersistenceCapable},
      * following the property-based persistent attribute access rules, or
      * will raise an exception if the class does not meet the requirements
-     * for subclassing.  Otherwise, this will return an instance of the
+     * for subclassing. Otherwise, this will return an instance of the
      * specified class.
      */
     public <T> T createInstance(Class<T> cls);
@@ -894,16 +888,15 @@
     public boolean isRemoved(Object o);
 
     /**
-     * 	Returns <code>true</code> if <code>pc</code> is a detached object
-	 * 	(one that can be reattached to a {@link EntityManager} via a call
-	 *	to {@link EntityManager#merge}); otherwise returns
-	 *	<code>false</code>.
+     * Returns <code>true</code> if <code>pc</code> is a detached object
+	 * (one that can be reattached to a {@link EntityManager} via a call
+	 * to {@link EntityManager#merge}); otherwise returns
+	 * <code>false</code>.
 	 */
 	public boolean isDetached (Object o);
 
-
 	/**
-	 *	Returns the current version indicator for <code>o</code>.
+	 * Returns the current version indicator for <code>o</code>.
 	 */
 	public Object getVersion (Object o);
 }

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@
 import org.apache.openjpa.lib.util.Closeable;
 
 /**
- * <p>Interface implemented by OpenJPA entity manager factories.</p>
+ * Interface implemented by OpenJPA entity manager factories.
  *
  * @author Abe White
  * @since 4.0
@@ -56,7 +56,7 @@
     public Object getUserObject(Object key);
 
     /**
-     * Access the level 2 store cache.  This cache acts as a proxy to all
+     * Access the level 2 store cache. This cache acts as a proxy to all
      * named caches.
      */
     public StoreCache getStoreCache();
@@ -74,7 +74,7 @@
     public OpenJPAEntityManager createEntityManager();
 
     /**
-     * <p>Return an entity manager with the provided additional configuration
+     * Return an entity manager with the provided additional configuration
      * settings. OpenJPA recognizes the following configuration settings in this
      * method:
      * <ul>
@@ -88,18 +88,18 @@
 
     /**
      * Register a listener for lifecycle-related events on the specified
-     * classes.  If the classes are null, all events will be propagated to
-     * the listener.  The listener will be passed on to all new entity
-     * managers.  See the <code>org.apache.openjpa.event</code> package for listener types.
+     * classes. If the classes are null, all events will be propagated to
+     * the listener. The listener will be passed on to all new entity
+     * managers. See the <code>org.apache.openjpa.event</code> package for listener types.
      *
      * @since 3.3
      */
     public void addLifecycleListener(Object listener, Class... classes);
 
     /**
-     *	Remove a listener for lifecycle-related events.
+     * Remove a listener for lifecycle-related events.
      *
-     *	@since 3.3
+     * @since 3.3
      */
     public void removeLifecycleListener (Object listener);
 }

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -48,8 +48,8 @@
 import org.apache.openjpa.util.StringId;
 
 /**
- * <p>Static helper method for JPA users, including switching
- * between OpenJPA native and Java Persistence APIs.</p>
+ * Static helper method for JPA users, including switching
+ * between OpenJPA native and Java Persistence APIs.
  *
  * @author Abe White
  * @published
@@ -160,7 +160,7 @@
 
     /**
      * Returns the {@link OpenJPAEntityManagerFactory} specified by
-     * your OpenJPA defaults.  This method will return the same logical factory
+     * your OpenJPA defaults. This method will return the same logical factory
      * for each invocation.
      */
     public static OpenJPAEntityManagerFactory getEntityManagerFactory() {
@@ -169,7 +169,7 @@
 
     /**
      * Returns the {@link OpenJPAEntityManagerFactory} specified by
-     * your OpenJPA defaults, using <code>map</code> as overrides.  This method
+     * your OpenJPA defaults, using <code>map</code> as overrides. This method
      * will return the same logical factory for invocations with the same
      * overrides.
      */
@@ -185,17 +185,14 @@
     }
 
     /**
-     * <p>Returns a new {@link OpenJPAEntityManagerFactory} specified by
+     * Returns a new {@link OpenJPAEntityManagerFactory} specified by
      * <code>name</code> in an XML configuration file at the resource location
      * <code>resource</code>. If <code>name</code> is <code>null</code>, uses
      * the first resource found in the specified location, regardless of the
      * name specified in the XML resource or the name of the jar that the
      * resource is contained in. If <code>resource</code> is <code>null</code>,
-     * uses the spec-defined <code>META-INF/persistence.xml</code>
-     * resource.</p>
-     * <p/>
-     * <p>This method only resolves {@link OpenJPAEntityManagerFactory}
-     * instances.</p>
+     * uses the spec-defined <code>META-INF/persistence.xml</code> resource.
+     *  This method only resolves {@link OpenJPAEntityManagerFactory} instances.
      */
     public static OpenJPAEntityManagerFactory createEntityManagerFactory
         (String name, String resource) {
@@ -203,7 +200,7 @@
     }
 
     /**
-     * <p>Returns a new {@link OpenJPAEntityManagerFactory} specified by
+     * Returns a new {@link OpenJPAEntityManagerFactory} specified by
      * <code>name</code> in an XML configuration file at the resource location
      * <code>resource</code>, applying the properties specified in
      * <code>map</code> as overrides. If <code>name</code> is
@@ -211,10 +208,8 @@
      * location, regardless of the name specified in the XML resource or the
      * name of the jar that the resource is contained in.
      * If <code>resource</code> is <code>null</code>, uses the spec-defined
-     * <code>META-INF/persistence.xml</code> resource.</p>
-     * <p/>
-     * <p>This method only resolves {@link OpenJPAEntityManagerFactory}
-     * instances.</p>
+     * <code>META-INF/persistence.xml</code> resource.
+     *  This method only resolves {@link OpenJPAEntityManagerFactory} instances.
      */
     public static OpenJPAEntityManagerFactory createEntityManagerFactory
         (String name, String resource, Map map) {
@@ -316,7 +311,7 @@
     }
 
     /**
-     * Close the given resource.  The resource can be an extent iterator,
+     * Close the given resource. The resource can be an extent iterator,
      * query result, large result set relation, or any closeable OpenJPA
      * component.
      */
@@ -433,7 +428,7 @@
     }
 
     /**
-     *	Translate from a OpenJPA identity class to a native one.
+     * Translate from a OpenJPA identity class to a native one.
      */
     public static Class fromOpenJPAObjectIdClass(Class oidClass) {
         if (oidClass == null)

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,7 +29,7 @@
 import org.apache.openjpa.kernel.exps.FilterListener;
 
 /**
- * <p>Interface implemented by OpenJPA queries.</p>
+ * Interface implemented by OpenJPA queries.
  *
  * @since 4.0
  * @author Abe White
@@ -175,8 +175,7 @@
     /**
      * Returns a description of the commands that will be sent to
      * the datastore in order to execute this query. This will
-     * typically be in the native query language of the database
-     * (e.g., SQL).
+     * typically be in the native query language of the database (e.g., SQL).
      *
      * @param params the named parameter map for the query invocation
      */
@@ -207,7 +206,7 @@
     public OpenJPAQuery setFlushMode(FlushModeType flushMode);
 
     /**
-     *	Return the current flush mode.
+     * Return the current flush mode.
 	 */
 	public FlushModeType getFlushMode ();
 }

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@
 import org.apache.openjpa.util.StoreException;
 
 /**
- * <p>Optimistic concurrency violation.</p>
+ * Optimistic concurrency violation.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,7 @@
 import org.apache.openjpa.util.Exceptions;
 
 /**
- * <p>General persistence exception.</p>
+ * General persistence exception.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>Converts from OpenJPA to persistence exception types.</p>
+ * Converts from OpenJPA to persistence exception types.
  *
  * @author Abe White
  * @author Marc Prud'hommeaux
@@ -84,7 +84,7 @@
     /**
      * Translate the given exception.
      *
-     * @param    checked        whether to translate checked exceptions
+     * @param checked whether to translate checked exceptions
      */
     private static Throwable translateException(Throwable t, boolean checked) {
         if (isPersistenceException(t))
@@ -236,8 +236,8 @@
     }
 
     /**
-     *	Helper method to extract a nested exception from an internal nested
-     *	array in a safe way.
+     * Helper method to extract a nested exception from an internal nested
+     * array in a safe way.
      */
     static Throwable getCause(Throwable[] nested) {
         if (nested == null || nested.length == 0)

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -53,7 +53,7 @@
 import org.apache.openjpa.util.MetaDataException;
 
 /**
- * </p>Javax persistence-based metadata defaults.</p>
+ * Javax persistence-based metadata defaults.
  *
  * @author Patrick Linskey
  * @author Abe White
@@ -96,7 +96,7 @@
     }
 
     /**
-     * Return the code for the strategy of the given member.  Return null if
+     * Return the code for the strategy of the given member. Return null if
      * no strategy.
      */
     public static PersistenceStrategy getPersistenceStrategy

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -49,7 +49,7 @@
 import org.apache.openjpa.util.MetaDataException;
 
 /**
- * <p>{@link MetaDataFactory} for JPA metadata.</p>
+ * {@link MetaDataFactory} for JPA metadata.
  *
  * @author Steve Kim
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
 
 /**
- * <p>Sets JPA specification defaults.</p>
+ * Sets JPA specification defaults.
  *
  * @author Abe White
  * @nojavadoc

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -46,15 +46,14 @@
         "org.apache.openjpa.ClassTransformerOptions";
 
     /**
-     * <p>Loads the entity manager specified by <code>name</code>, applying
+     * Loads the entity manager specified by <code>name</code>, applying
      * the properties in <code>m</code> as overrides to the properties defined
      * in the XML configuration file for <code>name</code>. If <code>name</code>
      * is <code>null</code>, this method loads the XML in the resource
      * identified by <code>resource</code>, and uses the first resource found
      * when doing this lookup, regardless of the name specified in the XML
-     * resource or the name of the jar that the resource is contained in.</p>
-     * <p/>
-     * <p>This does no pooling of EntityManagersFactories.</p>
+     * resource or the name of the jar that the resource is contained in.
+     *  This does no pooling of EntityManagersFactories.
      */
     public EntityManagerFactory createEntityManagerFactory(String name,
         String resource, Map m) {

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceStrategy.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@
 ///////////////////////////////////////////////////////////////////
 
 /**
- * <p>Set of field persistence strategies used in JPA.</p>
+ * Set of field persistence strategies used in JPA.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -243,14 +243,14 @@
     }
 
     /**
-     * The location of the persistence.xml resource.  May be null.
+     * The location of the persistence.xml resource. May be null.
      */
     public URL getPersistenceXmlFileUrl() {
         return _persistenceXmlFile;
     }
 
     /**
-     * The location of the persistence.xml resource.  May be null.
+     * The location of the persistence.xml resource. May be null.
      */
     public void setPersistenceXmlFileUrl(URL url) {
         _persistenceXmlFile = url;
@@ -438,7 +438,7 @@
     }
 
     /**
-     *	Simple class resolver built around the persistence unit loader.
+     * Simple class resolver built around the persistence unit loader.
      */
     private static class ClassResolverImpl
         implements ClassResolver {

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import javax.persistence.FetchType;
 
 /**
- * <p>Metadata annotation for a persistent field.</p>
+ * Metadata annotation for a persistent field.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import javax.persistence.FetchType;
 
 /**
- * <p>Metadata annotation for a persistent collection field.</p>
+ * Metadata annotation for a persistent collection field.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import javax.persistence.FetchType;
 
 /**
- * <p>Metadata annotation for a persistent map field.</p>
+ * Metadata annotation for a persistent map field.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,7 +41,7 @@
 import org.apache.openjpa.lib.util.Localizer;
 
 /**
- * <p>Implementation of {@link Query} interface.</p>
+ * Implementation of {@link Query} interface.
  *
  * @author Marc Prud'hommeaux
  * @author Abe White
@@ -56,7 +56,7 @@
         (QueryImpl.class);
 
     private final DelegatingQuery _query;
-    private transient Broker _broker;    // for profiling
+    private transient Broker _broker; // for profiling
     private transient EntityManagerImpl _em;
     private transient FetchPlan _fetch;
 
@@ -313,8 +313,7 @@
     }
 
     /**
-     * Cast the specified long down to an int, first checking
-     * for overflow.
+     * Cast the specified long down to an int, first checking for overflow.
      */
     private static int asInt(long l) {
         if (l > Integer.MAX_VALUE)

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import org.apache.openjpa.datacache.TypesChangedEvent;
 
 /**
- * <p>Query result cache.</p>
+ * Query result cache.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 /**
- * <p>Marks a field read-only.</p>
+ * Marks a field read-only.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,7 @@
 import org.apache.openjpa.util.Exceptions;
 
 /**
- * <p>Rollback occurred on attempt to commit.</p>
+ * Rollback occurred on attempt to commit.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@
 import org.apache.openjpa.meta.MetaDataRepository;
 
 /**
- * <p>Represents the L2 cache over the data store.</p>
+ * Represents the L2 cache over the data store.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>Transaction required.</p>
+ * Transaction required.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,8 +22,8 @@
 import java.lang.annotation.Target;
 
 /**
- * <p>Indicates the persistent type of a field, if different than the
- * declared type.</p>
+ * Indicates the persistent type of a field, if different than the
+ * declared type.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/UpdateAction.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/UpdateAction.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/UpdateAction.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/UpdateAction.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package org.apache.openjpa.persistence;
 
 /**
- * <p>Action to take when a field's value is changed.</p>
+ * Action to take when a field's value is changed.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -62,8 +62,8 @@
 import org.apache.openjpa.util.UnsupportedException;
 
 /**
- * <p>Custom SAX parser used by the system to quickly parse persistence i
- * metadata files.</p>
+ * Custom SAX parser used by the system to quickly parse persistence i
+ * metadata files.
  *
  * @author Steve Kim
  * @nojavadoc
@@ -185,7 +185,7 @@
     }
 
     /**
-     * The annotation parser.  When class is discovered in an XML file,
+     * The annotation parser. When class is discovered in an XML file,
      * we first parse any annotations present, then override with the XML.
      */
     public AnnotationPersistenceMetaDataParser getAnnotationParser() {
@@ -193,7 +193,7 @@
     }
 
     /**
-     * The annotation parser.  When class is discovered in an XML file,
+     * The annotation parser. When class is discovered in an XML file,
      * we first parse any annotations present, then override with the XML.
      */
     public void setAnnotationParser(
@@ -202,7 +202,7 @@
     }
 
     /**
-     * Returns the repository for this parser.  If none has been set, creates
+     * Returns the repository for this parser. If none has been set, creates
      * a new repository and sets it.
      */
     public MetaDataRepository getRepository() {
@@ -253,7 +253,7 @@
 
     /**
      * Whether to allow later parses of mapping information to override
-     * earlier information for the same class.  Defaults to false.  Useful
+     * earlier information for the same class. Defaults to false. Useful
      * when a tool is mapping a class, so that .jdo file partial mapping
      * information can be used even when mappings are stored in .orm files
      * or other locations.
@@ -264,7 +264,7 @@
 
     /**
      * Whether to allow later parses of mapping information to override
-     * earlier information for the same class.  Defaults to false.  Useful
+     * earlier information for the same class. Defaults to false. Useful
      * when a tool is mapping a class, so that .jdo file partial mapping
      * information can be used even when mappings are stored in .orm files
      * or other locations.
@@ -274,7 +274,7 @@
     }
 
     /**
-     * The parse mode according to the expected document type.  The
+     * The parse mode according to the expected document type. The
      * mode constants act as bit flags, and therefore can be combined.
      */
     public int getMode() {
@@ -350,7 +350,7 @@
     }
 
     /**
-     * Return the current element being parsed.  May be a class metadata,
+     * Return the current element being parsed. May be a class metadata,
      * field metadata, query metadata, etc.
      */
     protected Object currentElement() {
@@ -1122,14 +1122,14 @@
     }
 
     /**
-     * Implement to add field mapping data.  Does nothing by default.
+     * Implement to add field mapping data. Does nothing by default.
      */
     protected void startFieldMapping(FieldMetaData field, Attributes attrs)
         throws SAXException {
     }
 
     /**
-     * Implement to finalize field mapping.  Does nothing by default.
+     * Implement to finalize field mapping. Does nothing by default.
      */
     protected void endFieldMapping(FieldMetaData field)
         throws SAXException {
@@ -1226,7 +1226,7 @@
         throws SAXException {
         assertPC(fmd, "Embedded");
         fmd.setEmbedded(true);
-        fmd.setSerialized(false);    // override any Lob annotation
+        fmd.setSerialized(false); // override any Lob annotation
         if (fmd.getEmbeddedMetaData() == null)
             fmd.addEmbeddedMetaData();
     }
@@ -1250,7 +1250,7 @@
         if (val != null)
             fmd.setDeclaredType(classForName(val));
         assertPC(fmd, "OneToOne");
-        fmd.setSerialized(false);    // override any Lob annotation
+        fmd.setSerialized(false); // override any Lob annotation
         if (!fmd.isDefaultFetchGroupExplicit())
             fmd.setInDefaultFetchGroup(true);
     }
@@ -1264,7 +1264,7 @@
         if (val != null)
             fmd.setDeclaredType(classForName(val));
         assertPC(fmd, "ManyToOne");
-        fmd.setSerialized(false);    // override any Lob annotation
+        fmd.setSerialized(false); // override any Lob annotation
         if (!fmd.isDefaultFetchGroupExplicit())
             fmd.setInDefaultFetchGroup(true);
     }
@@ -1278,7 +1278,7 @@
         if (val != null)
             fmd.getElement().setDeclaredType(classForName(val));
         assertPCCollection(fmd, "ManyToMany");
-        fmd.setSerialized(false);    // override Lob in annotation
+        fmd.setSerialized(false); // override Lob in annotation
     }
 
     /**
@@ -1308,7 +1308,7 @@
         if (val != null)
             fmd.getElement().setDeclaredType(classForName(val));
         assertPCCollection(fmd, "OneToMany");
-        fmd.setSerialized(false);    // override any Lob annotation
+        fmd.setSerialized(false); // override any Lob annotation
     }
 
     /**
@@ -1626,7 +1626,7 @@
     }
 
     /**
-     *	Instantiate the given class, taking into account the default package.
+     * Instantiate the given class, taking into account the default package.
 	 */
 	protected Class classForName (String name)
 		throws SAXException

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -50,11 +50,11 @@
 import serp.util.Strings;
 
 /**
- * <p>Serializes persistence metadata back to XML.
+ * Serializes persistence metadata back to XML.
  * This class processes all object level tags that are store-agnostic.
  * However, it provides hooks for the subclasses to include store-specific
  * tags to be serialized both at &lt;entity-mappings&gt; and
- * &lt;entity&gt; level.</p>
+ * &lt;entity&gt; level.
  *
  * @since 4.0
  * @author Steve Kim
@@ -85,7 +85,7 @@
     private SerializationComparator _comp = null;
 
     /**
-     * Constructor.  Supply configuration.
+     * Constructor. Supply configuration.
      */
     public XMLPersistenceMetaDataSerializer(OpenJPAConfiguration conf) {
         _conf = conf;
@@ -117,7 +117,7 @@
     }
 
     /**
-     * The serialization mode according to the expected document type.  The
+     * The serialization mode according to the expected document type. The
      * mode constants act as bit flags, and therefore can be combined.
      */
     public int getMode() {
@@ -125,7 +125,7 @@
     }
 
     /**
-     * The serialization mode according to the expected document type.  The
+     * The serialization mode according to the expected document type. The
      * mode constants act as bit flags, and therefore can be combined.
      */
     public void setMode(int mode) {
@@ -178,7 +178,7 @@
     }
 
     /**
-     * Convenience method for interpreting {@link #getMode}.  Takes into
+     * Convenience method for interpreting {@link #getMode}. Takes into
      * account whether mapping information is loaded for the given instance.
      */
     protected boolean isMappingMode(ClassMetaData meta) {
@@ -190,7 +190,7 @@
     }
 
     /**
-     * Convenience method for interpreting {@link #getMode}.  Takes into
+     * Convenience method for interpreting {@link #getMode}. Takes into
      * account whether mapping information is loaded for the given instance.
      */
     protected boolean isMappingMode(ValueMetaData vmd) {
@@ -375,7 +375,7 @@
     }
 
     /**
-     * Add system-level mapping elements to be serialized.  Does nothing
+     * Add system-level mapping elements to be serialized. Does nothing
      * by default.
      */
     protected void addSystemMappingElements(Collection toSerialize) {
@@ -809,7 +809,7 @@
     }
 
     /**
-     * Add mapping attributes for the given class.  Does nothing by default
+     * Add mapping attributes for the given class. Does nothing by default
      */
     protected void addClassMappingAttributes(ClassMetaData mapping)
         throws SAXException {
@@ -834,21 +834,21 @@
     }
 
     /**
-     * Serialize class mapping content.  Does nothing by default.
+     * Serialize class mapping content. Does nothing by default.
      */
     protected void serializeClassMappingContent(ClassMetaData mapping)
         throws SAXException {
     }
 
     /**
-     * Serialize inheritance content.  Does nothing by default.
+     * Serialize inheritance content. Does nothing by default.
      */
     protected void serializeInheritanceContent(ClassMetaData mapping)
         throws SAXException {
     }
 
     /**
-     * Serialize query mappings.  Does nothing by default.
+     * Serialize query mappings. Does nothing by default.
      */
     protected void serializeQueryMappings(ClassMetaData meta)
         throws SAXException {
@@ -955,7 +955,7 @@
     }
 
     /**
-     * Add mapping attributes for the given field.  Does nothing by default.
+     * Add mapping attributes for the given field. Does nothing by default.
      */
     protected void addFieldMappingAttributes(FieldMetaData fmd,
         FieldMetaData orig)
@@ -983,7 +983,7 @@
     }
 
     /**
-     * Serialize attribute override mapping content.  Does nothing by default,
+     * Serialize attribute override mapping content. Does nothing by default,
      */
     protected void serializeAttributeOverrideMappingContent
         (FieldMetaData fmd, FieldMetaData orig)
@@ -1126,7 +1126,7 @@
 
     /**
      * Serialize field mapping content; this will be called before
-     * {@link #serializeValueMappingContent}.  Does nothing by default.
+     * {@link #serializeValueMappingContent}. Does nothing by default.
      */
     protected void serializeFieldMappingContent(FieldMetaData fmd,
         PersistenceStrategy strategy)
@@ -1134,7 +1134,7 @@
     }
 
     /**
-     * Set mapping attributes for strategy.  Sets mapped-by by default.
+     * Set mapping attributes for strategy. Sets mapped-by by default.
      */
     protected void addStrategyMappingAttributes(FieldMetaData fmd)
         throws SAXException {
@@ -1229,8 +1229,7 @@
         }
 
         /**
-         * Compare query metadata.
-         * Normal queries appear before native queries.
+         * Compare query metadata. Normal queries appear before native queries.
          * If the given queries use same language, then their names are
          * compared.
          */
@@ -1274,8 +1273,8 @@
 
     /**
      * Compares clases, sequences, and queries to order them for serialization.
-     * Places sequences first, then classes, then queries.  Sequences and
-     * queries are ordered alphabetically by name.  Classes are placed in
+     * Places sequences first, then classes, then queries. Sequences and
+     * queries are ordered alphabetically by name. Classes are placed in
      * listing order, in inheritance order within that, and in alphabetical
      * order within that.
      *
@@ -1315,7 +1314,7 @@
         }
 
         /**
-         * Compare two unrecognized elements of the same type.  Throws
+         * Compare two unrecognized elements of the same type. Throws
          * exception by default.
          */
         protected int compareUnknown(Object o1, Object o2) {
@@ -1370,8 +1369,8 @@
     }
 
     /**
-     *	Sorts fields according to listing order, then XSD strategy order,
-     *	then name order.
+     * Sorts fields according to listing order, then XSD strategy order,
+     * then name order.
      */
     private class FieldComparator
         implements Comparator {

Modified: incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java (original)
+++ incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*********************************************************************
-
- **********************************************************************/
 package org.apache.openjpa.xmlstore;
 
 import java.lang.reflect.Array;
@@ -40,8 +37,7 @@
 import serp.util.Numbers;
 
 /**
- * <p>In-memory form of data in datastore backing a single persistent
- * object.</p>
+ * In-memory form of data in datastore backing a single persistent object.
  */
 public final class ObjectData
     implements Cloneable {
@@ -52,7 +48,7 @@
     private ClassMetaData _meta;
 
     /**
-     * Create the object without underlying data.  Just pass in type specific
+     * Create the object without underlying data. Just pass in type specific
      * metadata and the oid.
      */
     public ObjectData(Object oid, ClassMetaData meta) {
@@ -106,7 +102,7 @@
 
     /**
      * Load the data and version information for this object into the
-     * given state manager.  Only fields in the given fetch configuration are
+     * given state manager. Only fields in the given fetch configuration are
      * loaded.
      */
     public void load(OpenJPAStateManager sm, FetchState fetchState) {
@@ -124,8 +120,7 @@
 
     /**
      * Load the data and version information for this object into the
-     * given state manager.  Only fields in the given bit set will be
-     * loaded.
+     * given state manager. Only fields in the given bit set will be loaded.
      */
     public void load(OpenJPAStateManager sm, BitSet fields,
         FetchState fetchState) {
@@ -211,7 +206,7 @@
 
     /**
      * Convert the given stored value <code>val</code> to a value for loading
-     * into a state manager.  The value <code>val</code> must be a singular
+     * into a state manager. The value <code>val</code> must be a singular
      * value; it cannot be a container.
      */
     private static Object toNestedLoadable(OpenJPAStateManager sm,
@@ -242,7 +237,7 @@
 
     /**
      * Store the data and version information for this object from the
-     * given state manager.  Only dirty fields will be stored.
+     * given state manager. Only dirty fields will be stored.
      */
     public void store(OpenJPAStateManager sm) {
         _version = (Long) sm.getVersion();

Modified: incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLConfiguration.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLConfiguration.java (original)
+++ incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLConfiguration.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*********************************************************************
-
- **********************************************************************/
 package org.apache.openjpa.xmlstore;
 
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
@@ -24,12 +21,12 @@
 import org.apache.openjpa.kernel.BrokerFactory;
 
 /**
- * <p>Configuration implementation for the XML file store.  Each unique
+ * Configuration implementation for the XML file store. Each unique
  * {@link BrokerFactory} has a distinct configuration instance.
  * Thus this configuration is shared by all {@link Broker}s
  * associated with the owning factory, and is a good place to provide access
- * to shared resources.  Note that each broker has its own
- * {@link org.apache.openjpa.abstractstore.AbstractStoreManager}.</p>
+ * to shared resources. Note that each broker has its own
+ * {@link org.apache.openjpa.abstractstore.AbstractStoreManager}.
  */
 public class XMLConfiguration
     extends OpenJPAConfigurationImpl {
@@ -63,7 +60,7 @@
     }
 
     /**
-     *	Return the {@link XMLStore} associated with this configuration.
+     * Return the {@link XMLStore} associated with this configuration.
      */
     public synchronized XMLStore getStore() {
         if (_store == null)

Modified: incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java (original)
+++ incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*********************************************************************
-
- **********************************************************************/
 package org.apache.openjpa.xmlstore;
 
 import java.io.ByteArrayInputStream;
@@ -57,8 +54,8 @@
 import org.apache.openjpa.util.UnsupportedException;
 
 /**
- * <p>Stores {@link ObjectData} objects by serializing a collection
- * of them into and out of an XML file.</p>
+ * Stores {@link ObjectData} objects by serializing a collection
+ * of them into and out of an XML file.
  */
 public class XMLFileHandler {
 
@@ -121,8 +118,8 @@
      * Stores all instances in <code>datas</code> into the appropriate file,
      * as dictated by <code>meta</code>.
      *
-     * @param    meta    the least-derived type of the instances being stored
-     * @param    datas    a collection of {@link ObjectData} instances, each
+     * @param meta the least-derived type of the instances being stored
+     * @param datas a collection of {@link ObjectData} instances, each
      * of which represents an object of type <code>meta</code>
      */
     public void store(ClassMetaData meta, Collection datas) {
@@ -238,7 +235,7 @@
     }
 
     /**
-     * Write out the data value.  This method writes nulls as "null",
+     * Write out the data value. This method writes nulls as "null",
      * serializes (using Java serialization and base16 encoding) out non-
      * primitives/boxed primitives and non-persistent types, and writes
      * primitives/boxed primitives and oids using their toString.
@@ -354,7 +351,7 @@
         private void startElement(String qName, Attributes attrs)
             throws Exception {
             switch (qName.charAt(0)) {
-                case 'o':    // object
+                case 'o': // object
                     // get the metadata for the type we're reading
                     String type = attrs.getValue("class");
                     ClassMetaData meta = _conf.getMetaDataRepository().
@@ -374,7 +371,7 @@
                     _object.setVersion(new Long(attrs.getValue("version")));
                     break;
 
-                case 'f':    // field
+                case 'f': // field
                     // start parsing a field element: for container types,
                     // initialize the container; for other types, initialize a
                     // buffer
@@ -393,9 +390,9 @@
                     }
                     break;
 
-                case 'e':    // element
-                case 'k':    // key
-                case 'v':    // value
+                case 'e': // element
+                case 'k': // key
+                case 'v': // value
                     // initialize a buffer for the element value
                     _buf = new StringBuffer();
                     break;
@@ -422,11 +419,11 @@
             throws Exception {
             Object val;
             switch (qName.charAt(0)) {
-                case 'o':     // object
+                case 'o': // object
                     // add the object to our results
                     _extent.add(_object);
 
-                case 'f':    // field
+                case 'f': // field
                     switch (_fmd.getTypeCode()) {
                         case JavaTypes.COLLECTION:
                         case JavaTypes.ARRAY:
@@ -443,20 +440,20 @@
                     _object.setField(_fmd.getIndex(), _fieldVal);
                     break;
 
-                case 'e':    // element
+                case 'e': // element
                     // cache element value
                     val = fromXMLString(_fmd.getElement().getTypeCode(),
                         _fmd.getElement().getTypeMetaData(), _buf.toString());
                     ((Collection) _fieldVal).add(val);
                     break;
 
-                case 'k':     // key
+                case 'k': // key
                     // cache key value
                     _keyVal = fromXMLString(_fmd.getKey().getTypeCode(),
                         _fmd.getKey().getTypeMetaData(), _buf.toString());
                     break;
 
-                case 'v':    // value
+                case 'v': // value
                     // create value and put cached key and value into map
                     val = fromXMLString(_fmd.getElement().getTypeCode(),
                         _fmd.getElement().getTypeMetaData(), _buf.toString());
@@ -587,7 +584,7 @@
     }
 
     /**
-     *	Utility methods for encoding and decoding XML strings.
+     * Utility methods for encoding and decoding XML strings.
      */
     private static class XMLEncoder {
 
@@ -652,8 +649,8 @@
         }
 
         /**
-         *	Create and initialize a buffer for the encoded/decoded string if
-         *	needed.
+         * Create and initialize a buffer for the encoded/decoded string if
+         * needed.
          */
         private static StringBuffer initializeBuffer(StringBuffer buf,
             String s, int i) {

Modified: incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStore.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStore.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStore.java (original)
+++ incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStore.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*********************************************************************
-
- **********************************************************************/
 package org.apache.openjpa.xmlstore;
 
 import java.util.Collection;
@@ -28,9 +25,9 @@
 import org.apache.openjpa.meta.ClassMetaData;
 
 /**
- * <p>Represents a store of object data encoded in XML.  This store only allows
- * one datastore transaction to proceed at a time.  File I/O errors can put
- * this store into an invalid state.</p>
+ * Represents a store of object data encoded in XML. This store only allows
+ * one datastore transaction to proceed at a time. File I/O errors can put
+ * this store into an invalid state.
  */
 public class XMLStore {
 
@@ -69,8 +66,7 @@
     }
 
     /**
-     * Returns the map of oids to object datas for the given
-     * least-derived type.
+     * Returns the map of oids to object datas for the given least-derived type.
      */
     private Map getMap(ClassMetaData meta) {
         Map m = (Map) _metaOidMaps.get(meta);
@@ -100,7 +96,7 @@
     }
 
     /**
-     * Begin a datastore transaction.  Obtains an exclusive write lock on the
+     * Begin a datastore transaction. Obtains an exclusive write lock on the
      * store.
      */
     public synchronized void beginTransaction() {
@@ -114,10 +110,10 @@
     }
 
     /**
-     *	End the datastore transaction.
+     * End the datastore transaction.
      *
-     *	@param    updates        {@link ObjectData} instances to insert or update
-     *	@param    deletes        {@link ObjectData} instances to delete
+     * @param updates {@link ObjectData} instances to insert or update
+     * @param deletes {@link ObjectData} instances to delete
      */
     public synchronized void endTransaction(Collection updates,
         Collection deletes) {

Modified: incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java (original)
+++ incubator/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*********************************************************************
-
- **********************************************************************/
 package org.apache.openjpa.xmlstore;
 
 import java.util.ArrayList;
@@ -39,12 +36,12 @@
 import serp.util.Numbers;
 
 /**
- * <p>Store manager to a back-end consisting of XML files.  This
+ * Store manager to a back-end consisting of XML files. This
  * implementation accesses data through the {@link XMLStore} associated with
- * its {@link XMLConfiguration}.  Configuration instances are shared by all
- * store managers owned by all brokers created with the same factory.</p>
+ * its {@link XMLConfiguration}. Configuration instances are shared by all
+ * store managers owned by all brokers created with the same factory.
  *
- * @see    AbstractStoreManager
+ * @see AbstractStoreManager
  */
 public class XMLStoreManager
     extends AbstractStoreManager {



Mime
View raw message