This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5ce2503a4b2143cff89f37940d21e28e54181d9d Author: David Blevins <david.blev...@gmail.com> AuthorDate: Wed May 15 16:05:55 2019 +0900 More javadoc cleaning --- .../org/apache/openejb/config/ServiceUtils.java | 2 +- .../stat/descriptive/DescriptiveStatistics.java | 2 +- .../org/apache/openejb/math/util/DoubleArray.java | 4 +- .../org/apache/openejb/math/util/MathUtils.java | 16 ++++---- .../openejb/math/util/ResizableDoubleArray.java | 6 +-- .../persistence/JtaEntityManagerRegistry.java | 2 +- .../resource/jdbc/dbcp/BasicDataSource.java | 2 +- .../resource/jdbc/dbcp/BasicManagedDataSource.java | 2 +- .../main/java/org/apache/openejb/util/Base64.java | 10 ++--- .../test/singleton/SingletonBeanTxTests.java | 34 ++++++++-------- .../test/singleton/SingletonHandleTests.java | 4 +- .../test/singleton/SingletonPojoHandleTests.java | 4 +- .../openejb/test/stateful/StatefulBeanTxTests.java | 46 +++++++++++----------- .../test/stateless/StatelessBeanTxTests.java | 34 ++++++++-------- .../test/stateless/StatelessHandleTests.java | 4 +- .../test/stateless/StatelessPojoHandleTests.java | 4 +- .../org/apache/openejb/client/ClientSecurity.java | 4 +- .../tomee/catalina/OpenEJBNamingResource.java | 2 +- .../org/apache/tomee/loader/TomcatEmbedder.java | 2 +- .../java/org/apache/tomee/loader/TomcatHook.java | 2 +- 20 files changed, 93 insertions(+), 93 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java index 170966b..6fdccb0 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java @@ -38,7 +38,7 @@ public class ServiceUtils { /** * Default service provider package. This value is choosen as follows: - * </p> + * * 1. System property "openejb.provider.default" </br> * 2. If in a full server containing a "conf" directory "org.apache.tomee" </br> * 3. Embedded mode "org.apache.openejb.embedded" </br> diff --git a/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java b/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java index c55b9e5..c6f89d9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java @@ -414,7 +414,7 @@ public class DescriptiveStatistics implements StatisticalSummary, Serializable { * <p> * The implementation provided here follows the first estimation procedure presented * <a href="http://www.itl.nist.gov/div898/handbook/prc/section2/prc252.htm">here.</a> - * </p><p> + * <p> * <strong>Preconditions</strong>:<ul> * <li><code>0 < p ≤ 100</code> (otherwise an * <code>IllegalArgumentException</code> is thrown)</li> diff --git a/container/openejb-core/src/main/java/org/apache/openejb/math/util/DoubleArray.java b/container/openejb-core/src/main/java/org/apache/openejb/math/util/DoubleArray.java index 7e35f3a..effe849 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/math/util/DoubleArray.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/math/util/DoubleArray.java @@ -73,12 +73,12 @@ public interface DoubleArray { * Adds an element to the end of the array and removes the first * element in the array. Returns the discarded first element. * The effect is similar to a push operation in a FIFO queue. - * </p> + * * <p> * Example: If the array contains the elements 1, 2, 3, 4 (in that order) * and addElementRolling(5) is invoked, the result is an array containing * the entries 2, 3, 4, 5 and the value returned is 1. - * </p> + * * * @param value the value to be added to the array * @return the value which has been discarded or "pushed" out of the array diff --git a/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java index 0e42521..17a792f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java @@ -444,7 +444,7 @@ public final class MathUtils { * error (inclusive). * <p> * Two NaNs are considered equals, as are two infinities with same sign. - * </p> + * * * @param x first value * @param y second value @@ -527,7 +527,7 @@ public final class MathUtils { * Long.MAX_VALUE</code> is 20. If the computed value exceeds <code>Long.MAX_VALUE</code> * an <code>ArithMeticException </code> is thrown.</li> * </ul> - * </p> + * * * @param n argument * @return <code>n!</code> @@ -562,7 +562,7 @@ public final class MathUtils { * Double.MAX_VALUE</code> is 170. If the computed value exceeds * Double.MAX_VALUE, Double.POSITIVE_INFINITY is returned</li> * </ul> - * </p> + * * * @param n argument * @return <code>n!</code> @@ -615,7 +615,7 @@ public final class MathUtils { * using the "binary gcd" method which avoids division and modulo * operations. See Knuth 4.5.2 algorithm B. This algorithm is due to Josef * Stein (1961). - * </p> + * * Special cases: * <ul> * <li>The invocations @@ -704,7 +704,7 @@ public final class MathUtils { * using the "binary gcd" method which avoids division and modulo * operations. See Knuth 4.5.2 algorithm B. This algorithm is due to Josef * Stein (1961). - * </p> + * * Special cases: * <ul> * <li>The invocations @@ -883,7 +883,7 @@ public final class MathUtils { * <p> * Returns the least common multiple of the absolute value of two numbers, * using the formula <code>lcm(a,b) = (a / gcd(a,b)) * b</code>. - * </p> + * * Special cases: * <ul> * <li>The invocations <code>lcm(Integer.MIN_VALUE, n)</code> and @@ -918,7 +918,7 @@ public final class MathUtils { * <p> * Returns the least common multiple of the absolute value of two numbers, * using the formula <code>lcm(a,b) = (a / gcd(a,b)) * b</code>. - * </p> + * * Special cases: * <ul> * <li>The invocations <code>lcm(Long.MIN_VALUE, n)</code> and @@ -953,7 +953,7 @@ public final class MathUtils { * <p>Returns the * <a href="http://mathworld.wolfram.com/Logarithm.html">logarithm</a> * for base <code>b</code> of <code>x</code>. - * </p> + * * <p>Returns <code>NaN<code> if either argument is negative. If * <code>base</code> is 0 and <code>x</code> is positive, 0 is returned. * If <code>base</code> is positive and <code>x</code> is 0, diff --git a/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java b/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java index f67024e..89ba234 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java @@ -289,12 +289,12 @@ public class ResizableDoubleArray implements DoubleArray, Serializable { * Adds an element to the end of the array and removes the first * element in the array. Returns the discarded first element. * The effect is similar to a push operation in a FIFO queue. - * </p> + * * <p> * Example: If the array contains the elements 1, 2, 3, 4 (in that order) * and addElementRolling(5) is invoked, the result is an array containing * the entries 2, 3, 4, 5 and the value returned is 1. - * </p> + * * * @param value the value to be added to the array * @return the value which has been discarded or "pushed" out of the array @@ -484,7 +484,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable { * the new array size will be <code>internalArray.length * expansionFactor.</code> * If <code>expansionMode</code> is set to ADDITIVE_MODE, the length * after expansion will be <code>internalArray.length + expansionFactor</code> - * </p> + * */ protected synchronized void expand() { diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java index 407c261..7c47cc8 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java @@ -68,7 +68,7 @@ public class JtaEntityManagerRegistry { /** * Gets an entity manager instance from the transaction registry, extended registry or for a transaction scoped * entity manager, creates a new one when an existing instance is not found. - * </p> + * * It is important that a component adds extended scoped entity managers to this registry when the component is * entered and removes them when exited. If this registration is not performed, an IllegalStateException will * be thrown when entity manger is fetched. diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java index 014b2ac..00208f4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java @@ -113,7 +113,7 @@ public class BasicDataSource extends org.apache.commons.dbcp2.BasicDataSource im /** * <p> * Sets the {@link #passwordCipher}. - * </p> + * * * @param passwordCipher password codec value */ diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java index 770c8bd..f2ff9ff 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java @@ -169,7 +169,7 @@ public class BasicManagedDataSource extends org.apache.commons.dbcp2.managed.Bas /** * <p> * Sets the {@link #passwordCipher}. - * </p> + * * * @param passwordCipher password codec value */ diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java index c0eb196..da457f7 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java @@ -95,10 +95,10 @@ public class Base64 { * indices. * <p> * For example, <code>base64Alphabet['+']</code> returns <code>62</code>. - * </p> + * * <p> * The value of undefined encodings is <code>-1</code>. - * </p> + * */ private static final byte[] base64Alphabet = new byte[BASELENGTH]; @@ -107,13 +107,13 @@ public class Base64 { * Contains the Base64 encodings <code>A</code> through <code>Z</code>, followed by <code>a</code> through * <code>z</code>, followed by <code>0</code> through <code>9</code>, followed by <code>+</code>, and * <code>/</code>. - * </p> + * * <p> * This array is accessed by using character values as indices. - * </p> + * * <p> * For example, <code>lookUpBase64Alphabet[62] </code> returns <code>'+'</code>. - * </p> + * */ private static final byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH]; diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java index a1e8518..75a0f9f 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java @@ -89,12 +89,12 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * resource managers used by the instance between the begin() and commit(),or rollback(), * methods with the transaction. When the instance attempts to commit the transaction, the Container is * responsible for the global coordination of the transaction commit. - * </P> + * * <P>--------------------------------------------------------</P> * * Check that a javax.transaction.UserTransaction can be obtained from * the javax.ejb.EJBContext - * </P> + * */ public void test01_EJBContext_getUserTransaction() { try { @@ -115,12 +115,12 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * resource managers used by the instance between the begin() and commit(),or rollback(), * methods with the transaction. When the instance attempts to commit the transaction, the Container is * responsible for the global coordination of the transaction commit. - * </P> + * * <P>--------------------------------------------------------</P> * * Check that a javax.transaction.UserTransaction can be obtained from * the environment entry java:comp/UserTransaction - * </P> + * */ public void test02_java_comp_UserTransaction() { try { @@ -137,11 +137,11 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * The Container must throw the java.lang.IllegalStateException if an instance of a bean * with bean-managed transaction demarcation attempts to invoke the setRollbackOnly() or * getRollbackOnly() method of the javax.ejb.EJBContext interface. - * </P> + * * <P>--------------------------------------------------------</P> * * Test that setRollbackOnly() throws a java.lang.IllegalStateException - * </P> + * */ public void TODO_test03_EJBContext_setRollbackOnly() { try { @@ -157,11 +157,11 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * The Container must throw the java.lang.IllegalStateException if an instance of a bean * with bean-managed transaction demarcation attempts to invoke the setRollbackOnly() or * getRollbackOnly() method of the javax.ejb.EJBContext interface. - * </P> + * * <P>--------------------------------------------------------</P> * * Test that getRollbackOnly() throws a java.lang.IllegalStateException - * </P> + * */ public void TODO_test04_EJBContext_getRollbackOnly() { try { @@ -226,7 +226,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * * The Container must allow the enterprise bean instance to serially perform several transactions in a * method. - * </P> + * */ public void TODO_test07_serialTransactions() { try { @@ -244,7 +244,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * interface while the instance has not committed the previous * transaction, the Container must throw the * javax.transaction.NotSupportedException in the begin() method. - * </P> + * */ public void TODO_test08_nestedTransactions() { try { @@ -269,7 +269,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * <LI>Discard the instance of the session bean. * <LI>Throw the java.rmi.RemoteException to the client. * </UL> - * </P> + * */ public void TODO_test09_beginWithNoCommit() { try { @@ -286,7 +286,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -312,13 +312,13 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * * If the client request is not associated with a transaction and the instance is not associated with a * transaction, the container invokes the instance with an unspecified transaction context. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 1: none none<BR> * If the client's transaction is none and the transaction currently * associated with instance none then the transaction associated with the method is none. - * </P> + * */ public void TODO_test10_scenario1_NoneNone() { try { @@ -335,7 +335,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -363,11 +363,11 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase * the container suspends the client's transaction association and invokes the method with * an unspecified transaction context. The container resumes the client's ntransaction association * (T1) when the method completes. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 2: T1 none<BR> - * </P> + * */ public void TODO_test11_scenario2_T1None() { try { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java index b6ab919..0207ef7 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java @@ -66,13 +66,13 @@ public class SingletonHandleTests extends BasicSingletonTestClient { * ....It is invalid to reference a session object that does * not exist. Attempted invocations on a session object * that does not exist result in java.rmi.NoSuchObjectException. - * </P> + * * * * This remove method of the EJBHome is placed hear as it * is more a test on the handle then on the remove method * itself. - * </P> + * */ public void test02_EJBHome_remove() { try { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java index 8c9c779..5382fea 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java @@ -56,13 +56,13 @@ public class SingletonPojoHandleTests extends BasicSingletonTestClient { * ....It is invalid to reference a session object that does * not exist. Attempted invocations on a session object * that does not exist result in java.rmi.NoSuchObjectException. - * </P> + * * * * This remove method of the EJBHome is placed hear as it * is more a test on the handle then on the remove method * itself. - * </P> + * */ public void test02_EJBHome_remove() { try { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java index 372beba..f059b24 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java @@ -89,12 +89,12 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * resource managers used by the instance between the begin() and commit(),or rollback(), * methods with the transaction. When the instance attempts to commit the transaction, the Container is * responsible for the global coordination of the transaction commit. - * </P> + * * <P>--------------------------------------------------------</P> * * Check that a javax.transaction.UserTransaction can be obtained from * the javax.ejb.EJBContext - * </P> + * */ public void test01_EJBContext_getUserTransaction() { try { @@ -115,12 +115,12 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * resource managers used by the instance between the begin() and commit(),or rollback(), * methods with the transaction. When the instance attempts to commit the transaction, the Container is * responsible for the global coordination of the transaction commit. - * </P> + * * <P>--------------------------------------------------------</P> * * Check that a javax.transaction.UserTransaction can be obtained from * the environment entry java:comp/UserTransaction - * </P> + * */ public void test02_java_comp_UserTransaction() { try { @@ -137,11 +137,11 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * The Container must throw the java.lang.IllegalStateException if an instance of a bean * with bean-managed transaction demarcation attempts to invoke the setRollbackOnly() or * getRollbackOnly() method of the javax.ejb.EJBContext interface. - * </P> + * * <P>--------------------------------------------------------</P> * * Test that setRollbackOnly() throws a java.lang.IllegalStateException - * </P> + * */ public void TODO_test03_EJBContext_setRollbackOnly() { try { @@ -157,11 +157,11 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * The Container must throw the java.lang.IllegalStateException if an instance of a bean * with bean-managed transaction demarcation attempts to invoke the setRollbackOnly() or * getRollbackOnly() method of the javax.ejb.EJBContext interface. - * </P> + * * <P>--------------------------------------------------------</P> * * Test that getRollbackOnly() throws a java.lang.IllegalStateException - * </P> + * */ public void TODO_test04_EJBContext_getRollbackOnly() { try { @@ -226,7 +226,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * * The Container must allow the enterprise bean instance to serially perform several transactions in a * method. - * </P> + * */ public void TODO_test07_serialTransactions() { try { @@ -244,7 +244,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * interface while the instance has not committed the previous * transaction, the Container must throw the * javax.transaction.NotSupportedException in the begin() method. - * </P> + * */ public void TODO_test08_nestedTransactions() { try { @@ -265,7 +265,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * commits or rolls back the transaction. When the client invokes * the next business method, the Container must invoke the business * method in this transaction context. - * </P> + * */ public void TODO_test09_methodSpanningTransactions() { try { @@ -282,7 +282,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -308,13 +308,13 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * * If the client request is not associated with a transaction and the instance is not associated with a * transaction, the container invokes the instance with an unspecified transaction context. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 1: none none<BR> * If the client's transaction is none and the transaction currently * associated with instance none then the transaction associated with the method is none. - * </P> + * */ public void TODO_test10_scenario1_NoneNone() { try { @@ -331,7 +331,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -359,11 +359,11 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * the container suspends the client's transaction association and invokes the method with * an unspecified transaction context. The container resumes the client's transaction association * (T1) when the method completes. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 2: T1 none<BR> - * </P> + * */ public void TODO_test11_scenario2_T1None() { try { @@ -380,7 +380,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -407,11 +407,11 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * If the client request is not associated with a transaction and the instance is already associated * with a transaction T2, the container invokes the instance with the transaction that is associated * with the instance (T2). This case can never happen for a stateless Session Bean. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 3: none T2<BR> - * </P> + * */ public void TODO_test12_scenario3_NoneT2() { try { @@ -428,7 +428,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -457,11 +457,11 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase { * method with the transaction context that is associated with the instance (T2). The container * resumes the client's transaction association (T1) when the method completes. This case can * never happen for a stateless Session Bean. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 4: T1 T2<BR> - * </P> + * */ public void TODO_test13_scenario4_T1T2() { try { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java index 73d526e..768b7fe 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java @@ -89,12 +89,12 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * resource managers used by the instance between the begin() and commit(),or rollback(), * methods with the transaction. When the instance attempts to commit the transaction, the Container is * responsible for the global coordination of the transaction commit. - * </P> + * * <P>--------------------------------------------------------</P> * * Check that a javax.transaction.UserTransaction can be obtained from * the javax.ejb.EJBContext - * </P> + * */ public void test01_EJBContext_getUserTransaction() { try { @@ -115,12 +115,12 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * resource managers used by the instance between the begin() and commit(),or rollback(), * methods with the transaction. When the instance attempts to commit the transaction, the Container is * responsible for the global coordination of the transaction commit. - * </P> + * * <P>--------------------------------------------------------</P> * * Check that a javax.transaction.UserTransaction can be obtained from * the environment entry java:comp/UserTransaction - * </P> + * */ public void test02_java_comp_UserTransaction() { try { @@ -137,11 +137,11 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * The Container must throw the java.lang.IllegalStateException if an instance of a bean * with bean-managed transaction demarcation attempts to invoke the setRollbackOnly() or * getRollbackOnly() method of the javax.ejb.EJBContext interface. - * </P> + * * <P>--------------------------------------------------------</P> * * Test that setRollbackOnly() throws a java.lang.IllegalStateException - * </P> + * */ public void TODO_test03_EJBContext_setRollbackOnly() { try { @@ -157,11 +157,11 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * The Container must throw the java.lang.IllegalStateException if an instance of a bean * with bean-managed transaction demarcation attempts to invoke the setRollbackOnly() or * getRollbackOnly() method of the javax.ejb.EJBContext interface. - * </P> + * * <P>--------------------------------------------------------</P> * * Test that getRollbackOnly() throws a java.lang.IllegalStateException - * </P> + * */ public void TODO_test04_EJBContext_getRollbackOnly() { try { @@ -226,7 +226,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * * The Container must allow the enterprise bean instance to serially perform several transactions in a * method. - * </P> + * */ public void TODO_test07_serialTransactions() { try { @@ -244,7 +244,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * interface while the instance has not committed the previous * transaction, the Container must throw the * javax.transaction.NotSupportedException in the begin() method. - * </P> + * */ public void TODO_test08_nestedTransactions() { try { @@ -269,7 +269,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * <LI>Discard the instance of the session bean. * <LI>Throw the java.rmi.RemoteException to the client. * </UL> - * </P> + * */ public void TODO_test09_beginWithNoCommit() { try { @@ -286,7 +286,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -312,13 +312,13 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * * If the client request is not associated with a transaction and the instance is not associated with a * transaction, the container invokes the instance with an unspecified transaction context. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 1: none none<BR> * If the client's transaction is none and the transaction currently * associated with instance none then the transaction associated with the method is none. - * </P> + * */ public void TODO_test10_scenario1_NoneNone() { try { @@ -335,7 +335,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently * associated with the instance (i.e. a transaction that was started but not completed by a previous * business method). - * </P> + * * <PRE> * ========================================================================= * Container's actions for methods of beans with bean-managed transaction @@ -363,11 +363,11 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase * the container suspends the client's transaction association and invokes the method with * an unspecified transaction context. The container resumes the client's ntransaction association * (T1) when the method completes. - * </P> + * * <P>--------------------------------------------------------</P> * * Test scenario 2: T1 none<BR> - * </P> + * */ public void TODO_test11_scenario2_T1None() { try { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java index 6f72f17..be47492 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java @@ -66,13 +66,13 @@ public class StatelessHandleTests extends BasicStatelessTestClient { * ....It is invalid to reference a session object that does * not exist. Attempted invocations on a session object * that does not exist result in java.rmi.NoSuchObjectException. - * </P> + * * * * This remove method of the EJBHome is placed hear as it * is more a test on the handle then on the remove method * itself. - * </P> + * */ public void test02_EJBHome_remove() { try { diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java index b0bd25d..766cc97 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java @@ -56,13 +56,13 @@ public class StatelessPojoHandleTests extends BasicStatelessTestClient { * ....It is invalid to reference a session object that does * not exist. Attempted invocations on a session object * that does not exist result in java.rmi.NoSuchObjectException. - * </P> + * * * * This remove method of the EJBHome is placed hear as it * is more a test on the handle then on the remove method * itself. - * </P> + * */ public void test02_EJBHome_remove() { try { diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java index 6ffac10..3b7ff6e 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java @@ -64,7 +64,7 @@ public class ClientSecurity { * Login the spedified user using the specified password. This is a global login for the * entire Java Virtural Machine. If you would like to have a thread scoped login, use * ClientSecurity.login(username, password, true); - * </p> + * * This is the equivalent of ClientSecurity.login(username, password, false); * * @param username the user to login @@ -79,7 +79,7 @@ public class ClientSecurity { /** * Login the spedified user using the specified password either globally for the * entire Java Virtural Machine or scoped to the thread. - * </p> + * * When using thread scoped login, you should logout in a finally block. This particularly * when using thread pools. If a thread is returned to the pool with a login attached to the * thread the next user of that thread will inherit the thread scoped login. diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java index d0c14ea..8e16654 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java @@ -127,7 +127,7 @@ public class OpenEJBNamingResource extends NamingResourcesImpl { * tomcat uses a hastable to store entry type, null values are not allowed * <p> * These occur when the reference is declared using a 'lookup' attribute These do not have a type associated - * </p> + * * @param ref */ private void normalize(final ResourceBase ref) { diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java index fbb2d7c..e837964 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java @@ -104,7 +104,7 @@ public class TomcatEmbedder { * Return path to jar file that contains this class. * <p> * Normally, tomee.war/lib/tomee-loader.jar - * </p> + * * @return path to jar file that contains this class */ private static File getThisJar() { diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java index 8ce19c3..49a4059 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java @@ -68,7 +68,7 @@ class TomcatHook { * This method is called from {@link TomcatEmbedder#embed(Properties, ClassLoader)} * method from classloader that contains openejb-loader and tomee-loader * with CatalinaClassLoader as the parent. - * </p> + * * @param properties properties file */ static void hook(final Properties properties) {