You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/07/14 01:45:02 UTC
svn commit: r421741 [14/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...
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOCondVar.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOCondVar.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOCondVar.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOCondVar.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -117,7 +120,7 @@
}
for (; ;) {
WaitQueue.WaitNode w = wq.extract();
- if (w == null) return; // no one to signal
+ if (w == null) return; // no one to signal
if (w.signal(sync)) return; // notify if still waiting, else skip
}
}
@@ -128,7 +131,7 @@
}
for (; ;) {
WaitQueue.WaitNode w = wq.extract();
- if (w == null) return; // no more to signal
+ if (w == null) return; // no more to signal
w.signal(sync);
}
}
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOWaitQueue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOWaitQueue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOWaitQueue.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/FIFOWaitQueue.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Lock.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Lock.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Lock.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Lock.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -51,7 +54,7 @@
* responsibility. The absence of block-structured locking removes the
* automatic release of locks that occurs with <tt>synchronized</tt>
* methods and statements. In most cases, the following idiom should be used:
- * <p/>
+ *
* <pre><tt> Lock l = ...; l.lock(); try {
* // access the resource protected by this lock } finally { l.unlock(); }
* </tt></pre>
@@ -59,7 +62,7 @@
* taken to ensure that all code that is executed while the lock is
* held is protected by try-finally or try-catch to ensure that the
* lock is released when necessary.
- * <p/>
+ *
* <tt>Lock</tt> implementations provide additional functionality
* over the use of <tt>synchronized</tt> methods and statements by
* providing a non-blocking attempt to acquire a lock({@link
@@ -80,7 +83,7 @@
* instances in this way, except within their own implementation.
* Except where noted, passing a <tt>null</tt> value for any
* parameter will result in a {@link NullPointerException} being thrown.
- * <p/>
+ *
* <h3>Memory Synchronization</h3>
* All <tt>Lock</tt> implementations <em>must</em> enforce the same
* memory synchronization semantics as provided by the built-in monitor
@@ -91,11 +94,10 @@
* synchronization effects as a successful <em>Lock</em> action.
* <li>A successful <tt>unlock</tt> operation has the same
* memory synchronization effects as a successful <em>Unlock</em> action.
- * </ul>
- * Unsuccessful locking and unlocking operations, and reentrant
+ * </ul> Unsuccessful locking and unlocking operations, and reentrant
* locking/unlocking operations, do not require any memory
* synchronization effects.
- * <p/>
+ *
* <h3>Implementation Considerations</h3>
* The three forms of lock acquisition(interruptible,
* non-interruptible, and timed) may differ in their performance
@@ -156,7 +158,7 @@
* </ul>
* then {@link InterruptedException} is thrown and the current thread's
* interrupted status is cleared.
- * <p/>
+ *
* <b>Implementation Considerations</b>
* The ability to interrupt a lock acquisition in some
* implementations may not be possible, and if possible may be an
@@ -192,7 +194,7 @@
* doesn't try to unlock if the lock was not acquired.
*
* @return <tt>true</tt> if the lock was acquired and <tt>false</tt>
- * otherwise.
+ * otherwise.
*/
boolean tryLock();
@@ -220,7 +222,7 @@
* If the specified waiting time elapses then the value <tt>false</tt>
* is returned. If the time is
* less than or equal to zero, the method will not wait at all.
- * <p/>
+ *
* <b>Implementation Considerations</b>
* The ability to interrupt a lock acquisition in some implementations
* may not be possible, and if possible may be an expensive operation.
@@ -237,7 +239,7 @@
* @param time the maximum time to wait for the lock
* @param unit the time unit of the <tt>time</tt> argument.
* @return <tt>true</tt> if the lock was acquired and <tt>false</tt>
- * if the waiting time elapsed before the lock was acquired.
+ * if the waiting time elapsed before the lock was acquired.
* @throws InterruptedException if the current thread is interrupted
* while acquiring the lock(and interruption of lock acquisition is
* supported).
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NanoTimer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NanoTimer.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NanoTimer.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NanoTimer.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Queue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Queue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Queue.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Queue.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -31,8 +34,8 @@
* operation). The latter form of the insert operation is designed
* specifically for use with capacity-restricted <tt>Queue</tt>
* implementations; in most implementations, insert operations cannot fail.
- * <p/>
- * <p/>
+ *
+ *
* <table BORDER CELLPADDING=3 CELLSPACING=1>
* <tr>
* <td></td>
@@ -54,8 +57,7 @@
* <td>{@link #element element()}</td>
* <td>{@link #peek peek()}</td>
* </tr>
- * </table>
- * Queues typically, but do not necessarily, order elements in a
+ * </table> Queues typically, but do not necessarily, order elements in a
* FIFO(first-in-first-out) manner. Among the exceptions are
* priority queues, which order elements according to a supplied
* comparator, or the elements' natural ordering, and LIFO queues(or
@@ -88,7 +90,7 @@
* which wait for elements to appear or for space to become available, are
* defined in the {@link edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue} interface, which
* extends this interface.
- * <p/>
+ *
* <tt>Queue</tt> implementations generally do not allow insertion
* of <tt>null</tt> elements, although some implementations, such as
* {@link LinkedList}, do not prohibit insertion of <tt>null</tt>.
@@ -96,15 +98,14 @@
* not be inserted into a <tt>Queue</tt>, as <tt>null</tt> is also
* used as a special return value by the <tt>poll</tt> method to
* indicate that the queue contains no elements.
- * <p/>
+ *
* <tt>Queue</tt> implementations generally do not define
* element-based versions of methods <tt>equals</tt> and
* <tt>hashCode</tt> but instead inherit the identity based versions
* from class <tt>Object</tt>, because element-based equality is not
* always well-defined for queues with the same elements but different
* ordering properties.
- * <p/>
- * This interface is a member of the
+ * This interface is a member of the
* <a href="{@docRoot}/../guide/collections/index.html">
* Java Collections Framework</a>.
*
@@ -149,7 +150,7 @@
*
* @param e the element to add
* @return <tt>true</tt> if the element was added to this queue, else
- * <tt>false</tt>
+ * <tt>false</tt>
* @throws ClassCastException if the class of the specified element
* prevents it from being added to this queue
* @throws NullPointerException if the specified element is null and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ReentrantLock.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ReentrantLock.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ReentrantLock.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ReentrantLock.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -29,8 +32,7 @@
* the lock is not owned by another thread. The method will return
* immediately if the current thread already owns the lock. This can
* be checked using methods {@link #isHeldByCurrentThread}, and {@link
- * #getHoldCount}.
- * The constructor for this class accepts an optional
+ * #getHoldCount}. The constructor for this class accepts an optional
* <em>fairness</em> parameter. When set <tt>true</tt>, under
* contention, locks favor granting access to the longest-waiting
* thread. Otherwise this lock does not guarantee any particular
@@ -48,13 +50,11 @@
* It is recommended practice to <em>always</em> immediately
* follow a call to <tt>lock</tt> with a <tt>try</tt> block, most
* typically in a before/after construction such as:
- * <p/>
+ *
* <pre> class X { private final ReentrantLock lock = new ReentrantLock();
- * // ...
- * public void m() { lock.lock(); // block until condition holds try {
+ * // ... public void m() { lock.lock(); // block until condition holds try {
* // ... method body } finally { lock.unlock() } } }
- * </pre>
- * In addition to implementing the {@link Lock} interface, this
+ * </pre> In addition to implementing the {@link Lock} interface, this
* class defines methods <tt>isLocked</tt> and
* <tt>getLockQueueLength</tt>, as well as some associated
* <tt>protected</tt> access methods that may be useful for
@@ -376,7 +376,7 @@
Thread caller = Thread.currentThread();
for (; ;) {
WaitQueue.WaitNode w = getSignallee(caller);
- if (w == null) return; // no one to signal
+ if (w == null) return; // no one to signal
if (w.signal(this)) return; // notify if still waiting, or skip
}
}
@@ -431,8 +431,7 @@
/**
* Acquires the lock.
* Acquires the lock if it is not held by another thread and returns
- * immediately, setting the lock hold count to one.
- * If the current thread
+ * immediately, setting the lock hold count to one. If the current thread
* already holds the lock then the hold count is incremented by one and
* the method returns immediately.
* If the lock is held by another thread then the
@@ -454,25 +453,23 @@
* If the lock is held by another thread then the
* current thread becomes disabled for thread scheduling
* purposes and lies dormant until one of two things happens:
- * <p/>
+ *
* <ul>
- * <p/>
+ *
* <li>The lock is acquired by the current thread; or
- * <p/>
+ *
* <li>Some other thread {@link Thread#interrupt interrupts} the current
* thread.
- * <p/>
- * </ul>
- * If the lock is acquired by the current thread then the lock hold
- * count is set to one.
- * If the current thread:
- * <p/>
+ *
+ * </ul> If the lock is acquired by the current thread then the lock hold
+ * count is set to one. If the current thread:
+ *
* <ul>
- * <p/>
+ *
* <li>has its interrupted status set on entry to this method; or
- * <p/>
+ *
* <li>is {@link Thread#interrupt interrupted} while acquiring the lock,
- * <p/>
+ *
* </ul>
* then {@link InterruptedException} is thrown and the current thread's
* interrupted status is cleared.
@@ -489,8 +486,7 @@
/**
* Acquires the lock only if it is not held by another thread at the time
- * of invocation.
- * Acquires the lock if it is not held by another thread and
+ * of invocation. Acquires the lock if it is not held by another thread and
* returns immediately with the value <tt>true</tt>, setting the
* lock hold count to one. Even when this lock has been set to use a
* fair ordering policy, a call to <tt>tryLock()</tt> <em>will</em>
@@ -508,8 +504,8 @@
* immediately with the value <tt>false</tt>.
*
* @return <tt>true</tt> if the lock was free and was acquired by the
- * current thread, or the lock was already held by the current thread; and
- * <tt>false</tt> otherwise.
+ * current thread, or the lock was already held by the current thread; and
+ * <tt>false</tt> otherwise.
*/
public boolean tryLock() {
return sync.tryLock();
@@ -526,36 +522,34 @@
* are waiting for the lock. This is in contrast to the {@link #tryLock()}
* method. If you want a timed <tt>tryLock</tt> that does permit barging on
* a fair lock then combine the timed and un-timed forms together:
- * <p/>
+ *
* <pre>if (lock.tryLock() || lock.tryLock(timeout, unit) ) { ... }
- * </pre>
- * If the current thread
+ * </pre> If the current thread
* already holds this lock then the hold count is incremented by one and
* the method returns <tt>true</tt>.
* If the lock is held by another thread then the
* current thread becomes disabled for thread scheduling
* purposes and lies dormant until one of three things happens:
- * <p/>
+ *
* <ul>
- * <p/>
+ *
* <li>The lock is acquired by the current thread; or
- * <p/>
+ *
* <li>Some other thread {@link Thread#interrupt interrupts} the current
* thread; or
- * <p/>
+ *
* <li>The specified waiting time elapses
- * <p/>
+ *
* </ul>
* If the lock is acquired then the value <tt>true</tt> is returned and
- * the lock hold count is set to one.
- * If the current thread:
- * <p/>
+ * the lock hold count is set to one. If the current thread:
+ *
* <ul>
- * <p/>
+ *
* <li>has its interrupted status set on entry to this method; or
- * <p/>
+ *
* <li>is {@link Thread#interrupt interrupted} while acquiring the lock,
- * <p/>
+ *
* </ul>
* then {@link InterruptedException} is thrown and the current thread's
* interrupted status is cleared.
@@ -571,9 +565,9 @@
* @param timeout the time to wait for the lock
* @param unit the time unit of the timeout argument
* @return <tt>true</tt> if the lock was free and was acquired by the
- * current thread, or the lock was already held by the current thread; and
- * <tt>false</tt> if the waiting time elapsed before the lock could be
- * acquired.
+ * current thread, or the lock was already held by the current thread; and
+ * <tt>false</tt> if the waiting time elapsed before the lock could be
+ * acquired.
* @throws InterruptedException if the current thread is interrupted
* @throws NullPointerException if unit is null
*/
@@ -583,8 +577,7 @@
}
/**
- * Attempts to release this lock.
- * If the current thread is the
+ * Attempts to release this lock. If the current thread is the
* holder of this lock then the hold count is decremented. If the
* hold count is now zero then the lock is released. If the
* current thread is not the holder of this lock then {@link
@@ -604,32 +597,32 @@
* usages as do the {@link Object} monitor methods({@link
* Object#wait() wait}, {@link Object#notify notify}, and {@link
* Object#notifyAll notifyAll}) when used with the built-in monitor lock.
- * <p/>
+ *
* <ul>
- * <p/>
+ *
* <li>If this lock is not held when any of the {@link Condition}
* {@link Condition#await() waiting} or {@link Condition#signal
* signalling} methods are called, then an {@link
* IllegalMonitorStateException} is thrown.
- * <p/>
+ *
* <li>When the condition {@link Condition#await() waiting}
* methods are called the lock is released and, before they
* return, the lock is reacquired and the lock hold count restored
* to what it was when the method was called.
- * <p/>
+ *
* <li>If a thread is {@link Thread#interrupt interrupted} while
* waiting then the wait will terminate, an {@link
* InterruptedException} will be thrown, and the thread's
* interrupted status will be cleared.
- * <p/>
+ *
* <li> Waiting threads are signalled in FIFO order
- * <p/>
+ *
* <li>The ordering of lock reacquisition for threads returning
* from waiting methods is the same as for threads initially
* acquiring the lock, which is in the default case not specified,
* but for <em>fair</em> locks favors those threads that have been
* waiting the longest.
- * <p/>
+ *
* </ul>
*
* @return the Condition object
@@ -645,14 +638,14 @@
* The hold count information is typically only used for testing and
* debugging purposes. For example, if a certain section of code should
* not be entered with the lock already held then we can assert that fact:
- * <p/>
+ *
* <pre> class X { ReentrantLock lock = new ReentrantLock(); // ...
* public void m() { assert lock.getHoldCount() == 0; lock.lock(); try {
* // ... method body } finally { lock.unlock(); } } }
* </pre>
*
* @return the number of holds on this lock by the current thread,
- * or zero if this lock is not held by the current thread.
+ * or zero if this lock is not held by the current thread.
*/
public int getHoldCount() {
return sync.getHoldCount();
@@ -664,21 +657,20 @@
* monitor locks, this method is typically used for debugging and
* testing. For example, a method that should only be called while
* a lock is held can assert that this is the case:
- * <p/>
+ *
* <pre> class X { ReentrantLock lock = new ReentrantLock(); // ...
- * public void m() { assert lock.isHeldByCurrentThread();
+ * public void m() { assert lock.isHeldByCurrentThread();
* // ... method body } }
- * </pre>
- * It can also be used to ensure that a reentrant lock is used
+ * </pre> It can also be used to ensure that a reentrant lock is used
* in a non-reentrant manner, for example:
- * <p/>
+ *
* <pre> class X { ReentrantLock lock = new ReentrantLock(); // ...
- * public void m() { assert !lock.isHeldByCurrentThread(); lock.lock();
+ * public void m() { assert !lock.isHeldByCurrentThread(); lock.lock();
* try { // ... method body } finally { lock.unlock(); } } }
* </pre>
*
* @return <tt>true</tt> if current thread holds this lock and
- * <tt>false</tt> otherwise.
+ * <tt>false</tt> otherwise.
*/
public boolean isHeldByCurrentThread() {
return sync.isHeldByCurrentThread();
@@ -690,7 +682,7 @@
* not for synchronization control.
*
* @return <tt>true</tt> if any thread holds this lock and
- * <tt>false</tt> otherwise.
+ * <tt>false</tt> otherwise.
*/
public boolean isLocked() {
return sync.isLocked();
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/TimeUnit.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/TimeUnit.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/TimeUnit.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/TimeUnit.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -32,12 +35,11 @@
* the following code will timeout in 50 milliseconds if the {@link
* edu.emory.mathcs.backport.java.util.concurrent.locks.Lock lock} is not
* available:
- * <p/>
+ *
* <pre> Lock lock = ...; if ( lock.tryLock(50L, TimeUnit.MILLISECONDS) ) ...
* </pre> while this code will timeout in 50 seconds:
* <pre> Lock lock = ...; if ( lock.tryLock(50L, TimeUnit.SECONDS) ) ...
- * </pre>
- * Note however, that there is no guarantee that a particular timeout
+ * </pre> Note however, that there is no guarantee that a particular timeout
* implementation will be able to notice the passage of time at the
* same granularity as the given <tt>TimeUnit</tt>.
*
@@ -385,15 +387,14 @@
* <tt>0</tt>. Conversions from coarser to finer granularities
* with arguments that would numerically overflow saturate to
* <tt>Long.MIN_VALUE</tt> if negative or <tt>Long.MAX_VALUE</tt>
- * if positive.
- * For example, to convert 10 minutes to milliseconds, use:
+ * if positive. For example, to convert 10 minutes to milliseconds, use:
* <tt>TimeUnit.MILLISECONDS.convert(10L, TimeUnit.MINUTES)</tt>
*
* @param sourceDuration the time duration in the given <tt>sourceUnit</tt>
* @param sourceUnit the unit of the <tt>sourceDuration</tt> argument
* @return the converted duration in this unit,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
*/
public abstract long convert(long sourceDuration, TimeUnit sourceUnit);
@@ -402,8 +403,8 @@
*
* @param duration the duration
* @return the converted duration,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
* @see #convert
*/
public abstract long toNanos(long duration);
@@ -413,8 +414,8 @@
*
* @param duration the duration
* @return the converted duration,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
* @see #convert
*/
public abstract long toMicros(long duration);
@@ -424,8 +425,8 @@
*
* @param duration the duration
* @return the converted duration,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
* @see #convert
*/
public abstract long toMillis(long duration);
@@ -435,8 +436,8 @@
*
* @param duration the duration
* @return the converted duration,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
* @see #convert
*/
public abstract long toSeconds(long duration);
@@ -446,8 +447,8 @@
*
* @param duration the duration
* @return the converted duration,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
* @see #convert
* @since 1.6
*/
@@ -458,8 +459,8 @@
*
* @param duration the duration
* @return the converted duration,
- * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
- * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+ * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+ * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
* @see #convert
* @since 1.6
*/
@@ -490,7 +491,7 @@
* into the form required by the <tt>Object.wait</tt> method.
* For example, you could implement a blocking <tt>poll</tt>
* method(see {@link BlockingQueue#poll BlockingQueue.poll}) using:
- * <p/>
+ *
* <pre> public synchronized Object poll(long timeout, TimeUnit unit)
* throws InterruptedException { while (empty) {
* unit.timedWait(this, timeout); ... } }</pre>
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -14,7 +17,7 @@
* Written by Dawid Kurzyniec, based on code written by Doug Lea with assistance
* from members of JCP JSR-166 Expert Group. Released to the public domain,
* as explained at http://creativecommons.org/licenses/publicdomain.
- * Thanks to Craig Mattocks for suggesting to use <code>sun.misc.Perf</code>.
+ * Thanks to Craig Mattocks for suggesting to use <code>sun.misc.Perf</code>.
*/
package org.apache.openjpa.lib.util.concurrent;
@@ -92,7 +95,7 @@
* in successive calls that span greater than approximately 292 years
* (2^63 nanoseconds) will not accurately compute elapsed time due to
* numerical overflow.
- * <p/>
+ *
* <em>Implementation note:</em>By default, this method uses
* <code>sun.misc.Perf</code> on Java 1.4.2, and falls back to
* System.currentTimeMillis() emulation on earlier JDKs. Custom
@@ -135,8 +138,7 @@
* thread, and interruption of thread suspension is supported; or
* <li>The specified waiting time elapses; or
* <li>A "<em>spurious wakeup</em>" occurs.
- * </ul>
- * In all cases, before this method can return the current thread must
+ * </ul> In all cases, before this method can return the current thread must
* re-acquire the lock associated with this condition. When the
* thread returns it is <em>guaranteed</em> to hold this lock.
* If the current thread:
@@ -148,8 +150,7 @@
* then {@link InterruptedException} is thrown and the current thread's
* interrupted status is cleared. It is not specified, in the first
* case, whether or not the test for interruption occurs before the lock
- * is released.
- * The method returns an estimate of the number of nanoseconds
+ * is released. The method returns an estimate of the number of nanoseconds
* remaining to wait given the supplied <tt>nanosTimeout</tt>
* value upon return, or a value less than or equal to zero if it
* timed out. Accuracy of this estimate is directly dependent on the
@@ -157,14 +158,14 @@
* whether and how long to re-wait in cases where the wait returns but an
* awaited condition still does not hold. Typical uses of this method take
* the following form:
- * <p/>
+ *
* <pre> synchronized boolean aMethod(long timeout, TimeUnit unit) {
* long nanosTimeout = unit.toNanos(timeout);
* while (!conditionBeingWaitedFor) { if (nanosTimeout > 0)
* nanosTimeout = theCondition.awaitNanos(nanosTimeout); else return false;
* } // ... }
* </pre>
- * <p/>
+ *
* <b>Implementation Considerations</b>
* The current thread is assumed to hold the lock associated with this
* <tt>Condition</tt> when this method is called.
@@ -181,9 +182,9 @@
* @param cond the condition to wait for
* @param nanosTimeout the maximum time to wait, in nanoseconds
* @return A value less than or equal to zero if the wait has
- * timed out; otherwise an estimate, that
- * is strictly less than the <tt>nanosTimeout</tt> argument,
- * of the time still remaining when this method returned.
+ * timed out; otherwise an estimate, that
+ * is strictly less than the <tt>nanosTimeout</tt> argument,
+ * of the time still remaining when this method returned.
* @throws InterruptedException if the current thread is interrupted(and
* interruption of thread suspension is supported).
*/
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/WaitQueue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/WaitQueue.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/WaitQueue.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/WaitQueue.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
@@ -88,7 +91,7 @@
return true;
else {
nanos = deadline - Utils.nanoTime();
- if (nanos <= 0) { // timed out
+ if (nanos <= 0) { // timed out
waiting = false;
return false;
}
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java Thu Jul 13 16:44:20 2006
@@ -1,10 +1,13 @@
/*
* Copyright 2006 The Apache Software Foundation.
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
* 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
- * Unless required by applicable law or agreed to in writing, software
+ *
+ * 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,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.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,
@@ -108,8 +108,8 @@
import serp.util.Strings;
/**
- * <p>Persistence annotation metadata parser. Currently does not parse
- * deployment descriptors.</p>
+ * Persistence annotation metadata parser. Currently does not parse
+ * deployment descriptors.
*
* @author Abe White
* @author Steve Kim
@@ -205,7 +205,7 @@
}
/**
- * Returns the repository for this parser. If none has been set,
+ * Returns the repository for this parser. If none has been set,
* create 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 annotation partial mapping
* information can be used even when mappings are stored in another
* location.
@@ -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 annotation partial mapping
* information can be used even when mappings are stored in another
* location.
@@ -630,7 +630,7 @@
}
/**
- * Find or create metadata for the given type. May return null if
+ * Find or create metadata for the given type. May return null if
* this class has already been parsed fully.
*/
private ClassMetaData getMetaData() {
@@ -741,7 +741,7 @@
}
/**
- * Parse @DetachedState. The annotation may be null.
+ * Parse @DetachedState. The annotation may be null.
*/
private void parseDetachedState(ClassMetaData meta,
DetachedState detached) {
@@ -774,11 +774,11 @@
/**
* Parse callback methods into the given array, and return that array,
- * creating one if null. Each index into the array is a collection of
+ * creating one if null. Each index into the array is a collection of
* callback adapters for that numeric event type.
*
- * @param sups whether to scan superclasses
- * @param listener whether this is a listener or not
+ * @param sups whether to scan superclasses
+ * @param listener whether this is a listener or not
*/
public static Collection<LifecycleCallbacks>[] parseCallbackMethods
(Class cls, Collection<LifecycleCallbacks>[] callbacks, boolean sups,
@@ -1139,7 +1139,7 @@
}
/**
- * Parse @Basic. Given annotation may be null.
+ * Parse @Basic. Given annotation may be null.
*/
private void parseBasic(FieldMetaData fmd, Basic anno, boolean lob) {
Class type = fmd.getDeclaredType();
@@ -1228,7 +1228,7 @@
}
/**
- * Parse @Embedded. Given annotation may be null.
+ * Parse @Embedded. Given annotation may be null.
*/
private void parseEmbedded(FieldMetaData fmd, Embedded anno) {
if (!JavaTypes.maybePC(fmd.getValue()))
@@ -1459,7 +1459,7 @@
if (StringUtils.isEmpty(seq)) {
clsName = SequenceMetaData.IMPL_NATIVE;
props = null;
- } else if (seq.indexOf('(') != -1) // plugin
+ } else if (seq.indexOf('(') != -1) // plugin
{
seq = null;
clsName = Configurations.getClassName(seq);
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.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>Extended {@link IllegalArgumentException}.</p>
+ * Extended {@link IllegalArgumentException}.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConfigurationProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConfigurationProviderImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConfigurationProviderImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConfigurationProviderImpl.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,
@@ -37,10 +37,10 @@
import org.apache.openjpa.util.GeneralException;
/**
- * <p>Configuration provider capable of loading a {@link Configuration} from
- * the current environment's JPA-style XML configuration data.</p>
- * <p/>
- * <p>For defaults, looks in <code>org.apache.openjpa.properties</code> system property for
+ * Configuration provider capable of loading a {@link Configuration} from
+ * the current environment's JPA-style XML configuration data.
+ *
+ * For defaults, looks in <code>org.apache.openjpa.properties</code> system property for
* the location of a file to parse. If no system property is defined, the
* default resource location of <code>org.apache.openjpa.xml</code> is used.
* If it exists, the resource is parsed as an XML file.
@@ -106,7 +106,7 @@
/**
* Load configuration from the given resource, with the given map of
- * overrides. If the resource is null, tries to load from persistence.xml,
+ * overrides. If the resource is null, tries to load from persistence.xml,
* but still returns true if persistence.xml does not exist.
*/
public boolean load(String name, String rsrc, Map m)
@@ -155,7 +155,7 @@
* resource into a new {@link PersistenceUnitInfo}. Then, applies the
* overrides in <code>m</code>.
*
- * @return {@link Boolean#TRUE} if the resource was loaded, null if it
+ * @return {@link Boolean#TRUE} if the resource was loaded, null if it
* does not exist, or {@link Boolean#FALSE} if it is not for OpenJPA
*/
private Boolean load(String name, String rsrc, Map m, ClassLoader loader,
@@ -252,8 +252,8 @@
}
/**
- * SAX handler capable of parsing an JPA persistence.xml file.
- * Package-protected for testing.
+ * SAX handler capable of parsing an JPA persistence.xml file.
+ * Package-protected for testing.
*/
static class ConfigurationParser
extends XMLMetaDataParser {
@@ -349,7 +349,7 @@
}
/**
- * Parse persistence-unit element.
+ * Parse persistence-unit element.
*/
private void startPersistenceUnit(Attributes attrs)
throws SAXException {
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.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 java.lang.annotation.Target;
/**
- * <p>Caching characteristics for this class.</p>
+ * Caching characteristics for this class.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.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 javax.persistence.GenerationType;
/**
- * <p>Describes how to generate a value for a field.</p>
+ * Describes how to generate a value for a field.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.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>Dependent field marker.</p>
+ * Dependent field marker.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.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>Detached state.</p>
+ * Detached state.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.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>Dependent array, collection, or map element marker.</p>
+ * Dependent array, collection, or map element marker.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.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 element type of an array, collection, or map
- * field, if different than the declared element type.</p>
+ * Indicates the persistent element type of an array, collection, or map
+ * field, if different than the declared element type.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.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>Conflict with existing entity.</p>
+ * Conflict with existing entity.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.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,
@@ -59,7 +59,7 @@
private transient QueryResultCache _queryCache = null;
/**
- * Constructor. Delegate must be provided on construction.
+ * Constructor. Delegate must be provided on construction.
*/
protected EntityManagerFactoryImpl(BrokerFactory factory) {
_factory = new DelegatingBrokerFactory(factory,
@@ -261,14 +261,14 @@
}
/**
- * Create a store-specific facade for the given fetch configuration.
- * The name of the facade class is formed by taking the top-most org.apache.openjpa.xxx
- * package and class name prefix from the fetch configuration class and
- * combining it as
- * <code>org.apache.openjpa.persistence.xxx.PrefixFetchConfiguration</code>.
- * The class must have a constructor that takes a
- * <code>FetchConfiguration</code> argument. If no facade class
- * exists, we use the default {@link FetchConfiguration}.
+ * Create a store-specific facade for the given fetch configuration.
+ * The name of the facade class is formed by taking the top-most org.apache.openjpa.xxx
+ * package and class name prefix from the fetch configuration class and
+ * combining it as
+ * <code>org.apache.openjpa.persistence.xxx.PrefixFetchConfiguration</code>.
+ * The class must have a constructor that takes a
+ * <code>FetchConfiguration</code> argument. If no facade class
+ * exists, we use the default {@link FetchConfiguration}.
*/
FetchPlan toFetchPlan(FetchConfiguration fetch) {
if (fetch == null)
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.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,
@@ -52,7 +52,7 @@
import org.apache.openjpa.util.UserException;
/**
- * <p>Implementation of {@link EntityManager} interface.</p>
+ * Implementation of {@link EntityManager} interface.
*
* @author Patrick Linskey
* @author Abe White
@@ -813,8 +813,7 @@
}
/**
- * Translate the javax.persistence enum value to our internal
- * lock level.
+ * Translate the javax.persistence enum value to our internal lock level.
*/
static int toLockLevel(LockModeType mode) {
if (mode == null)
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.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>Missing entity.</p>
+ * Missing entity.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.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.kernel.DelegatingExtent;
/**
- * <p>An extent is a logical view of all instances of a class.</p>
+ * An extent is a logical view of all instances of a class.
*
* @author Abe White
* @published
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.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,9 +22,9 @@
import java.lang.annotation.Target;
/**
- * <p>Maps field values to their datastore equivalents. Each element of
+ * Maps field values to their datastore equivalents. Each element of
* the value array should be a string in the form:
- * <code><field value>=<datastore value></code></p>
+ * <code><field value>=<datastore value></code>
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.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>Declares a method that transforms the field value to its datastore
- * equivalent.</p>
+ * Declares a method that transforms the field value to its datastore
+ * equivalent.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.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>Declares a method that transforms the datastore value to its field
- * equivalent.</p>
+ * Declares a method that transforms the datastore value to its field
+ * equivalent.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.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,
@@ -20,7 +20,7 @@
import java.lang.annotation.Target;
/**
- * <p>Includes a persistent attribute in a {@link FetchGroup}.</p>
+ * Includes a persistent attribute in a {@link FetchGroup}.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.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 java.lang.annotation.Target;
/**
- * <p>Fetch group definition.</p>
+ * Fetch group definition.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.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 java.lang.annotation.Target;
/**
- * <p>Fetch groups holder.</p>
+ * Fetch groups holder.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.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,8 +25,8 @@
import org.apache.openjpa.kernel.FetchConfiguration;
/**
- * <p>The fetch plan allows you to dynamically alter eager fetching
- * configuration and other aspects of data loading.</p>
+ * The fetch plan allows you to dynamically alter eager fetching
+ * configuration and other aspects of data loading.
*
* @author Abe White
* @since 4.0
@@ -72,7 +72,7 @@
/**
* Return the fetch batch size for large result set support.
- * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
+ * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
* that this property will be ignored under some data stores.
*/
public int getFetchBatchSize() {
@@ -81,7 +81,7 @@
/**
* Set the fetch batch size for large result set support.
- * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
+ * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
* that this property will be ignored under some data stores.
*/
public FetchPlan setFetchBatchSize(int fetchBatchSize) {
@@ -90,7 +90,7 @@
}
/**
- * Return whether or not query caching is enabled. If this returns
+ * Return whether or not query caching is enabled. If this returns
* <code>true</code> but the datacache plugin is not installed, caching
* will not be enabled. If this
* returns <code>false</code>, query caching will not be used
@@ -101,7 +101,7 @@
}
/**
- * Control whether or not query caching is enabled. This has no effect
+ * Control whether or not query caching is enabled. This has no effect
* if the datacache plugin is not installed, or if the query cache size
* is set to zero.
*/
@@ -112,7 +112,7 @@
/**
* Returns the names of the fetch groups that this component will use
- * when loading objects. Defaults to the
+ * when loading objects. Defaults to the
* <code>org.apache.openjpa.FetchGroups</code> setting.
*/
public Collection<String> getFetchGroups() {
@@ -192,7 +192,7 @@
/**
* Returns the fully qualified names of the fields that this component
- * will use when loading objects. Defaults to the empty set.
+ * will use when loading objects. Defaults to the empty set.
*/
public Collection<String> getFields() {
// return new FetchFieldSet ();
@@ -400,7 +400,7 @@
}
/**
- * View of fetch groups as collection.
+ * View of fetch groups as collection.
*/
// private class FetchGroupSet
// extends AbstractCollection<String>
@@ -431,7 +431,7 @@
// }
/**
- * View of fetch fields as collection.
+ * View of fetch fields as collection.
*/
// private class FetchFieldSet
// extends AbstractCollection<String>
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.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.meta.ClassMetaData;
/**
- * <p>Represents a store sequence.</p>
+ * Represents a store sequence.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.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>Extended {@link IllegalStateException}.</p>
+ * Extended {@link IllegalStateException}.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.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>Declares the logical inverse of a field.</p>
+ * Declares the logical inverse of a field.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.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>Dependent map key marker.</p>
+ * Dependent map key marker.
*
* @author Abe White
* @since 4.0
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.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 key type of a map field, if different than the
- * declared type.</p>
+ * Indicates the persistent key type of a map field, if different than the
+ * declared type.
*
* @author Abe White
* @since 4.0