You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2018/06/10 14:54:51 UTC

svn commit: r1833280 [2/2] - in /db/derby/code/trunk/java: org.apache.derby.client/org/apache/derby/client/ org.apache.derby.client/org/apache/derby/client/am/ org.apache.derby.client/org/apache/derby/client/net/ org.apache.derby.commons/org/apache/der...

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java Sun Jun 10 14:54:50 2018
@@ -167,9 +167,11 @@ public final class ProductVersionHolder
 	/**
 	  Create a valid ProductVersionHolder. If any of the
 	  parameters provided is invalid, this returns null.
+	  @param productVendorName The name of the vendor
 	  @param productName The name of the product. productName.length()
 	  must be greater than 0. The syntax for a product name is
 	  'productGenus[:productSpecies]'. 
+	  @param productTechnologyName The technology name
 	  @param majorVersion The most significant portion of a 3 
 	  part product version.  Must be non-negative.
 	  @param minorVersion The second portion of a 3 part 
@@ -243,6 +245,10 @@ public final class ProductVersionHolder
 		This is because the this class will either have been loaded from
 		only one of the jars and hence can only access the resource in its own jar.
 		By making code specific to the jar open the resource we are guaranteed it will work.
+
+        @param propertiesStream The version information
+
+        @return the product descriptor
 	*/
 	public static ProductVersionHolder
 	getProductVersionHolderFromMyEnv(InputStream propertiesStream)
@@ -303,6 +309,8 @@ public final class ProductVersionHolder
 
 	/**
 	  Return the product vendor name.
+
+      @return the vendor name
 	  */
 	public String getProductVendorName()
 	{
@@ -312,6 +320,8 @@ public final class ProductVersionHolder
 
 	/**
 	  Return the external product name.
+
+      @return the product name
 	  */
 	public String getProductName()
 	{
@@ -324,14 +334,20 @@ public final class ProductVersionHolder
 
 	/**
 	  Return the major version number.
+
+      @return the major version number
 	  */
 	public int getMajorVersion() {return majorVersion;}
 	/**
 	  Return the minor version number.
+
+      @return the minor version number
 	  */
 	public int getMinorVersion() {return minorVersion;}
 	/**
 	  Return the <B>encoded</B> maintainence version number.
+
+      @return the maintenance version number
 	  */
 	public int getMaintVersion() {return maintVersion;}
 
@@ -339,21 +355,29 @@ public final class ProductVersionHolder
 		Return the drda protocol maintenance version for this minor release.
 		Starts at 0 for each minor release and only incremented 
 		when client behaviour changes based on the server version.
+
+        @return the drda maintenance version number
 	**/
 	public int getDrdaMaintVersion() {return drdaMaintVersion; }
 
 	/**
        Return the fix pack version from the maintenance encoding.
+
+       @return the fix pack version number
 	*/
 	public int getFixPackVersion() { return maintVersion / MAINT_ENCODING; }
 
 
 	/**
 	  Return true if this is a beta product.
+
+      @return true if this is a beta product.
 	  */
 	public boolean isBeta() {return isBeta.booleanValue();}
 	/**
 	  Return true if this is a alpha product.
+
+      @return true if this is a alpha product.
 	  */
 	public boolean isAlpha() {
 		return	   (majorVersion >= 5)
@@ -362,6 +386,8 @@ public final class ProductVersionHolder
 	}
 	/**
 	  Return the build number for this product.
+
+      @return the build number for this product.
 	  */
 	public String getBuildNumber() {return buildNumber;}
 
@@ -372,6 +398,8 @@ public final class ProductVersionHolder
      * nnnnnM -&gt; returns -nnnnn indicates a modified code base
      * nnnnn:mmmmm -&gt; returns -nnnnn
      * anything else -&gt; returns -1
+     *
+     * @return the build number as an integer if possible,
     */
     public int getBuildNumberAsInt(){
     	if (buildNumber == null)
@@ -427,6 +455,8 @@ public final class ProductVersionHolder
 	  difference between this and createProductVersionString, is
 	  that this method retruns a String when this ProductVersionHolder
 	  holds invalid version information.
+
+      @return  a string representation of this ProductVersion.
 	 */
 	public String toString()
 	{
@@ -441,6 +471,8 @@ public final class ProductVersionHolder
 
 	/**
 		Return the feature version string, ie. major.minor. (e.g. 5.2)
+
+        @return the feature version string, ie. major.minor. (e.g. 5.2)
 	*/
 	public String getSimpleVersionString() {
 
@@ -449,6 +481,12 @@ public final class ProductVersionHolder
 
 	/**
 		Convert a major and minor number with beta status into a string.
+
+        @param major Major version number
+        @param minor Minor version number
+        @param isBeta Beta flag
+
+        @return a version string encoding the arguments
 	*/
 	public static String simpleVersionString(int major, int minor, boolean isBeta) {
 
@@ -511,7 +549,11 @@ public final class ProductVersionHolder
 	/**
 		Returns a short-hand value for the product version string.
 		Used by Sysinfo.
-		Includes the optional <beta> designation
+		Includes the optional beta designation
+
+        @param withBuild If true, include the build number
+
+        @return the build version string
 	*/
     public String getVersionBuildString(boolean withBuild)
     {

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java Sun Jun 10 14:54:50 2018
@@ -155,7 +155,7 @@ public interface Attribute
 
 	/**
 		The attribute that is used for the database name, from
-		the JDBC notion of jdbc:<subprotocol>:<subname>
+		the JDBC notion of jdbc:$subprotocol:$subname
 	*/
 	String DBNAME_ATTR = "databaseName";
 

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java Sun Jun 10 14:54:50 2018
@@ -98,7 +98,7 @@ public interface Property {
     
         /**
 		derby.stream.error.style=<b>The error stream error style.</b>
-        <b>rollingFile<b> is the only file currently supported.
+        <b>rollingFile</b> is the only file currently supported.
 		Takes precendence over derby.stream.error.file.
 		Takes precendence over derby.stream.error.method.
 		Takes precendence over derby.stream.error.field
@@ -115,7 +115,7 @@ public interface Property {
 
         /**
 		derby.stream.error.method=
-			<className>.<methodName> returning an OutputStream or Writer object
+			$className.$methodName returning an OutputStream or Writer object
 		Takes precendence over derby.stream.error.field
 	*/
 	
@@ -509,10 +509,13 @@ public interface Property {
 	String PROPERTIES_CONGLOM_ID = "derby.storage.propertiesId";
 
 	/**
+       <p>
 		derby.storage.tempDirectory
-		<BR>
+		</p>
+
+        <p>
 		Sets the temp directory for a database.
-		<P>
+        </p>
 	*/
 	String STORAGE_TEMP_DIRECTORY = "derby.storage.tempDirectory";
 	
@@ -1279,7 +1282,7 @@ public interface Property {
      * work properly if this flag is enabled, it is provided to do performance
      * debugging to see whether the system is I/O bound based on checkpoint
      * synchronous I/O.
-     * <p>
+     * </p>
      *
      **/
 	public static final String STORAGE_DATA_NOT_SYNCED_AT_CHECKPOINT = 
@@ -1295,7 +1298,7 @@ public interface Property {
      * work properly if this flag is enabled, it is provided to do performance
      * debugging to see whether the system is I/O bound based on page allocation
      * synchronous I/O.
-     * <p>
+     * </p>
      *
      **/
 	public static final String STORAGE_DATA_NOT_SYNCED_AT_ALLOCATION = 
@@ -1311,7 +1314,7 @@ public interface Property {
      * work properly if this flag is enabled, it is provided to do performance
      * debugging to see whether the system is I/O bound based on log file
      * synchronous I/O.
-     * <p>
+     * </p>
      *
      **/
 	public static final String STORAGE_LOG_NOT_SYNCED = 

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java Sun Jun 10 14:54:50 2018
@@ -41,10 +41,10 @@ package org.apache.derby.shared.common.r
 	<PRE>
 		if (se.getMessageId().equals(SQLState.DEADLOCK))
 	</PRE>
-	<BR>
+    <P>
 	A utility static method StandardException.getSQLState(String messageId)
 	exists to convert an field from this class into a five character SQLState.
-	<P>
+	</P>
 
 	<P>
 	The SQL state of an error message dictates the error's severity.
@@ -53,14 +53,17 @@ package org.apache.derby.shared.common.r
 	is expected to be 7 characters long and the last character determines
 	the state. If the state is seven characters long then only the first
 	five will be seen by the error reporting code and exception.
-	<BR>
+	</P>
+	<P>
 	If the state is 9 characters long, the last two characters encode
 	an exception category, which Synchronization uses to determine whether
 	the error causes REFRESH to halt or to simply skip the failed transaction.
 	All 5 and 7 character states default to the ENVIRONMENTAL exception
 	category.
-	<BR>
+	</P>
+    <P>
 	Here is the encoding of the SQL state, broken down by severity.
+	</P>
 	<UL>
 	<LI> <B> SYSTEM_SEVERITY </B>
 		xxxxx.M

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java Sun Jun 10 14:54:50 2018
@@ -33,21 +33,24 @@ import java.util.Enumeration;
  * can only be used for testing conditions that might occur
  * in development code but not in production code.	
  * <b>They are compiled out of production code.</b>
+ * </p>
  * <p>
  * Uses of assertions should not add AssertFailure catches or
  * throws clauses; AssertFailure is under RuntimeException
  * in the java exception hierarchy. Our outermost system block
  * will bring the system down when it detects an assertion
  * failure.
+ * </p>
  * <p>
  * In addition to ASSERTs in code, classes can choose to implement
  * an isConsistent method that would be used by ASSERTs, UnitTests,
  * and any other code wanting to check the consistency of an object.
+ * </p>
  * <p>
  * Assertions are meant to be used to verify the state of the system
  * and bring the system down if the state is not correct. Debug checks
  * are meant to display internal information about a running system.
- * <p>
+ * </p>
  * @see org.apache.derby.shared.common.sanity.AssertFailure
  */
 public class SanityManager {
@@ -84,12 +87,15 @@ public class SanityManager {
 	//
 
 	/**
+     * <p>
 	 * ASSERT checks the condition, and if it is
 	 * false, throws AssertFailure.
 	 * A message about the assertion failing is
 	 * printed.
-	 * <p>
+	 * </p>
 	 * @see org.apache.derby.shared.common.sanity.AssertFailure
+     *
+     * @param mustBeTrue A boolean expression which must evaluate to true
 	 */
 	public static final void ASSERT(boolean mustBeTrue) {
 		if (DEBUG)
@@ -107,11 +113,16 @@ public class SanityManager {
 	}
 
 	/**
+     * <p>
 	 * ASSERT checks the condition, and if it is
 	 * false, throws AssertFailure. The message will
 	 * be printed and included in the assertion.
-	 * <p>
+	 * </p>
+     *
 	 * @see org.apache.derby.shared.common.sanity.AssertFailure
+     *
+     * @param mustBeTrue An expression which must evaluate to true
+     * @param msgIfFail A message to emit if the expression evaluates to false
 	 */
 	public static final void ASSERT(boolean mustBeTrue, String msgIfFail) {
 		if (DEBUG)
@@ -184,18 +195,25 @@ public class SanityManager {
 	}
 
 	/**
+     * <p>
      * The DEBUG calls provide the ability to print information or
      * perform actions based on whether a debug flag is set or not.
      * debug flags are set in configurations and picked up by the
      * sanity manager when the monitor finds them (see CONFIG below).
+     * </p>
 	 * <p>
 	 * The message is output to the trace stream, so it ends up in
 	 * db2j.LOG. It will include a header line of
-	 *   DEBUG <flagname> OUTPUT:
+	 *   DEBUG $flagname OUTPUT:
 	 * before the message.
+     * </p>
 	 * <p>
 	 * If the debugStream stream cannot be found, the message is printed to
 	 * System.out.
+     * </p>
+     *
+     * @param flag The name of a debug flag
+     * @param message A message to print
      */
 	public static final void DEBUG(String flag, String message) {
 		if (DEBUG) {
@@ -206,18 +224,23 @@ public class SanityManager {
 	}
 
 	/**
+     * <p>
 	 * This can be called directly if you want to control
      * what is done once the debug flag has been verified --
 	 * for example, if you are calling a routine that prints to
 	 * the trace stream directly rather than returning a string to
 	 * be printed, or if you want to perform more (or fewer!)
+     * </p>
 	 *
 	 * <p>
      * Calls to this method should be surrounded with
 	 *     if (SanityManager.DEBUG) {
 	 *     }
 	 * so that they can be compiled out completely.
+     * </p>
 	 *
+     * @param flag The name of a debug flag
+     *
 	 * @return true if the flag has been set to "true"; false
 	 * if the flag is not set, or is set to something other than "true".
 	 */
@@ -336,14 +359,21 @@ public class SanityManager {
 	}
 
 	/**
+     * <p>
 	 * The DEBUG_PRINT calls provides a convenient way to print debug
 	 * information to the db2j.LOG file,  The message includes a header
+     * </p>
 	 *<p>
-	 *	DEBUG <flag> OUTPUT: 
+	 *	DEBUG $flag OUTPUT: 
 	 * before the message
+     * </p>
 	 *<p>
 	 * If the debugStream stream cannot be found, the message is printed to
 	 * System.out.
+     * </p>
+     *
+     * @param flag The name of a debug flag
+     * @param message A message to print
 	 *
 	 */
 	static public void DEBUG_PRINT(String flag, String message) {

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/HeaderPrintWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/HeaderPrintWriter.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/HeaderPrintWriter.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/HeaderPrintWriter.java Sun Jun 10 14:54:50 2018
@@ -39,11 +39,15 @@ public interface HeaderPrintWriter
 	 * <p>
 	 * All other writes to the stream use the
 	 * PrintStream interface.
+     *
+     * @param message Message to print
 	 */
 	public void printlnWithHeader(String message);
 
 	/**
 	 * Return the header for the stream.
+     *
+     * @return the stream header
 	 */
 	public PrintWriterGetHeader getHeader();
 	
@@ -55,12 +59,15 @@ public interface HeaderPrintWriter
 	 *
 	 * Interleaving calls to a printWriter and its associated HeaderPrintWriter
 	 * is not supported.
-	 * 
+	 *
+     * @return the print machinery
 	 */
 	public PrintWriter getPrintWriter();
 
 	/**
 	 * Gets the name of the wrapped writer or stream
+     *
+     * @return the name of the wrapped writer or stream
 	 */
 	public String getName ();
 
@@ -68,16 +75,28 @@ public interface HeaderPrintWriter
 	 * The routines that mimic java.io.PrintWriter...
 	 */
 	/**
+     * Print a message.
+     *
+     * @param message The message to print
+     *
 	 * @see java.io.PrintWriter#print
 	 */
 	public void print(String message);
 
 	/**
+     * Print a message with a newline.
+     *
+     * @param message The message to print
+     *
 	 * @see java.io.PrintWriter#println
 	 */
 	public void println(String message);
 
 	/**
+     * Print a message with a newline.
+     *
+     * @param message The message to print
+     *
 	 * @see java.io.PrintWriter#println
 	 */
 	public void println(Object message);

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/InfoStreams.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/InfoStreams.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/InfoStreams.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/stream/InfoStreams.java Sun Jun 10 14:54:50 2018
@@ -23,13 +23,15 @@ package org.apache.derby.shared.common.s
 
 /**
  *
+ * <p>
  * The Basic Services provide InfoStreams for reporting
  * information.
+ * </p>
  * <p>
  * When creating a message for a stream,
  * you can create an initial entry with header information
  * and then append to it as many times as desired.
- * <p>
+ * </p>
  * 
  * @see HeaderPrintWriter
  */

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java Sun Jun 10 14:54:50 2018
@@ -49,7 +49,15 @@ public abstract class ArrayUtil
 	//
 	///////////////////////////////////////////////////////////////////
 
-    /** Copy an array of objects; the original array could be null */
+    /**
+     * Copy an array of objects; the original array could be null
+     *
+     * @param <T> The type of the array cells
+     *
+     * @param original The original array to copy
+     *
+     * @return a copy of the array
+     */
     public  static <T> T[] copy( T[] original )
     {
         return (original == null) ?
@@ -57,31 +65,61 @@ public abstract class ArrayUtil
                 Arrays.copyOf(original, original.length);
     }
 
-    /** Copy a (possibly null) array of booleans */
+    /**
+     * Copy a (possibly null) array of booleans
+     *
+     * @param original The original array to copy
+     *
+     * @return a copy of the array
+     */
     public  static  boolean[]   copy( boolean[] original )
     {
         return (original == null) ? null : (boolean[]) original.clone();
     }
 
-    /** Copy a (possibly null) array of bytes */
+    /**
+     * Copy a (possibly null) array of bytes
+     *
+     * @param original The original array to copy
+     *
+     * @return a copy of the array
+     */
     public  static  byte[]   copy( byte[] original )
     {
         return (original == null) ? null : (byte[]) original.clone();
     }
 
-    /** Copy a (possibly null) array of ints */
+    /**
+     * Copy a (possibly null) array of ints
+     *
+     * @param original The original array to copy
+     *
+     * @return a copy of the array
+     */
     public  static  int[]   copy( int[] original )
     {
         return (original == null) ? null : (int[]) original.clone();
     }
 
-    /** Copy a (possibly null) array of longs */
+    /**
+     * Copy a (possibly null) array of longs
+     *
+     * @param original The original array to copy
+     *
+     * @return a copy of the array
+     */
     public  static  long[]   copy( long[] original )
     {
         return (original == null) ? null : (long[]) original.clone();
     }
 
-    /** Copy a (possibly null) 2-dimensional array of ints */
+    /**
+     * Copy a (possibly null) 2-dimensional array of ints
+     *
+     * @param original The original array to copy
+     *
+     * @return a copy of the array
+     */
     public  static  int[][]   copy2( int[][] original )
     {
         if ( original == null ) { return null; }
@@ -98,6 +136,13 @@ public abstract class ArrayUtil
     /**
      * Make the contents of an array available as a read-only list. If the
      * array is null, an empty list will be returned.
+     *
+     *
+     * @param <T> The type of the array cells
+     *
+     * @param array The array to turn into a read-only list
+     *
+     * @return a read-only list
      */
     @SafeVarargs
     public static <T> List<T> asReadOnlyList(T... array) {
@@ -209,6 +254,8 @@ public abstract class ArrayUtil
 
 	  @param	in	Input stream
 
+      @return the array of objects
+
 	  @exception java.io.IOException The write caused an IOException. 
 	  @exception java.lang.ClassNotFoundException The Class for an Object we are reading does not exist
 	  */
@@ -376,6 +423,7 @@ public abstract class ArrayUtil
 	  @return   the array of integers.
 
 	  @exception java.io.IOException The write caused an IOException. 
+	  @exception java.lang.ClassNotFoundException On error
 	  */
 	public static String[] readStringArray(ObjectInput in) 
 		throws IOException, ClassNotFoundException

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneIndexDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneIndexDescriptor.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneIndexDescriptor.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneIndexDescriptor.java Sun Jun 10 14:54:50 2018
@@ -36,12 +36,25 @@ public interface LuceneIndexDescriptor
     /**
      * Get the names of the fields which are created when text is indexed.
      * These fields can be mentioned later on when querying the index.
+     *
+     * @return an array of field names
      */
     public  String[]    getFieldNames();
     
-    /** Get the Analyzer used to create index terms */
+    /**
+     * Get the Analyzer used to create index terms
+     *
+     * @return the Analyzer
+     *
+     * @throws SQLException on error
+     */
     public Analyzer getAnalyzer()   throws SQLException;
 
-    /** Get the QueryParser used to parse query text */
+    /**
+     * Get the QueryParser used to parse query text
+     *
+     * @return the QueryParser
+     * @throws SQLException on error
+     */
     public  QueryParser getQueryParser()    throws SQLException;
 }

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java Sun Jun 10 14:54:50 2018
@@ -105,7 +105,11 @@ public abstract class LuceneUtils
     //
     /////////////////////////////////////////////////////////////////
 
-    /** Get the version of the Lucene library on the classpath. */
+    /**
+     * Get the version of the Lucene library on the classpath.
+     *
+     * @return the version of the Lucene library
+     */
     @SuppressWarnings("deprecation")
     public  static  Version currentVersion()
     {
@@ -130,6 +134,9 @@ public abstract class LuceneUtils
      * <p>
      * Get the default Analyzer associated with the database Locale.
      * </p>
+     *
+     * @return the default Analyzer
+     * @throws SQLException on error
      */
     public  static  Analyzer    defaultAnalyzer()
         throws SQLException
@@ -141,6 +148,10 @@ public abstract class LuceneUtils
      * <p>
      * Get the Analyzer associated with the given Locale.
      * </p>
+     *
+     * @param locale The locale whose Analyzer is needed
+     * @return the Analyzer associated with the given Locale.
+     * @throws SQLException on error
      */
     public  static  Analyzer    getAnalyzerForLocale( Locale locale )
         throws SQLException
@@ -168,6 +179,8 @@ public abstract class LuceneUtils
      * <p>
      * Get the StandardAnalyzer for parsing text.
      * </p>
+     *
+     * @return the standard Analyzer
      */
     public  static  Analyzer    standardAnalyzer()
     {
@@ -178,6 +191,12 @@ public abstract class LuceneUtils
      * <p>
      * Get the default, classic QueryParser.
      * </p>
+     *
+     * @param version The Lucene version
+     * @param fieldNames The field names of interest
+     * @param analyzer The Analyzer to use
+     *
+     * @return the corresponding QueryParser
      */
     public  static  QueryParser defaultQueryParser
         (
@@ -194,6 +213,8 @@ public abstract class LuceneUtils
      * Get the default index descriptor. This has a single field named TEXT,
      * a defaultAnalyzer() and a defaultQueryParser().
      * </p>
+     *
+     * @return the default index descriptor
      */
     public  static  LuceneIndexDescriptor   defaultIndexDescriptor()
     {
@@ -206,7 +227,11 @@ public abstract class LuceneUtils
     //
     /////////////////////////////////////////////////////////////////
 
-    /** Store an Analyzer class in the HashMap of Analyzers, keyed by language code */
+    /**
+     * Store an Analyzer class in the HashMap of Analyzers, keyed by language code
+     *
+     * @param analyzerClass An Analyzer class
+     */
     private static  void    storeAnalyzerClass( Class<? extends Analyzer> analyzerClass )
     {
         _analyzerClasses.put( getLanguageCode( analyzerClass ), analyzerClass );
@@ -217,6 +242,10 @@ public abstract class LuceneUtils
      * Get the language code for a Lucene Analyzer. Each of the Analyzers
      * lives in a package whose last leg is the language code.
      * </p>
+     *
+     * @param analyzerClass An Analyzer class
+     *
+     * @return the corresponding language code
      */
     private static  String  getLanguageCode( Class<? extends Analyzer> analyzerClass )
     {
@@ -238,15 +267,27 @@ public abstract class LuceneUtils
     {
         public  DefaultIndexDescriptor()    {}
 
-        /** Return the default array of field names { TEXT_FIELD_NAME }. */
+        /**
+         * Return the default array of field names { TEXT_FIELD_NAME }.
+         *
+         * @return the default array of field names
+         */
         public  String[]    getFieldNames() { return new String[] { TEXT_FIELD_NAME }; }
 
-        /** Return LuceneUtils.defaultAnalyzer() */
+        /**
+         * Return LuceneUtils.defaultAnalyzer()
+         *
+         * @return the default Analyzer
+         *
+         * @throws SQLException on error
+         */
         public Analyzer getAnalyzer()   throws SQLException
         { return LuceneUtils.defaultAnalyzer(); }
 
         /**
          * Return LuceneUtils.defaultQueryParser(  LuceneUtils.currentVersion(), getFieldNames(), getAnalyzer() ).
+         * @return the query parser
+         * @throws SQLException on error
          */
         public  QueryParser getQueryParser()
             throws SQLException

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java Sun Jun 10 14:54:50 2018
@@ -96,6 +96,11 @@ public abstract class SimpleJsonUtils
      * <li><i>All other types</i> - Converted to JSON
      * string values via their toString() methods.</li>
      * </ul>
+     *
+     * @param rs A ResultSet to turn into a JSON array
+     *
+     * @return a json array
+     * @throws SQLException on error
      */
     @SuppressWarnings("unchecked")
     public  static  JSONArray   toJSON( ResultSet rs )
@@ -134,6 +139,11 @@ public abstract class SimpleJsonUtils
 
     /**
      * Construct a JSONArray from a Reader.
+     *
+     * @param reader A Reader from which to de-serialize a json array
+     *
+     * @return a json array
+     * @throws SQLException on error
      */
     public static JSONArray readArray( Reader reader )
         throws SQLException
@@ -159,6 +169,12 @@ public abstract class SimpleJsonUtils
      * SQL FUNCTION to convert a JSON document string into a JSONArray.
      * This function is registered by the simpleJson optional tool.
      * </p>
+     *
+     * @param document A json array as a string
+     *
+     * @return a json array
+     *
+     * @throws SQLException on error
      */
     public  static  JSONArray   readArrayFromString( String document )
         throws SQLException
@@ -171,6 +187,12 @@ public abstract class SimpleJsonUtils
     /**
      * Read a JSONArray from an InputStream. Close the stream
      * after reading the JSONArray.
+     *
+     * @param inputStream A stream to read from
+     * @param characterSetName The character set of the stream
+     *
+     * @return a json array
+     * @throws SQLException on error
      */
     public static JSONArray readArrayFromStream
         ( InputStream inputStream, String characterSetName )
@@ -192,6 +214,12 @@ public abstract class SimpleJsonUtils
     /**
      * SQL FUNCTION to read a JSONArray from a File. This function
      * is registered by the simpleJson optional tool.
+     *
+     * @param fileName A file to read
+     * @param characterSetName The character encoding of the file
+     *
+     * @return a json array
+     * @throws SQLException on error
      */
     public static JSONArray readArrayFromFile
         ( String fileName, String characterSetName )
@@ -219,6 +247,12 @@ public abstract class SimpleJsonUtils
     /**
      * SQL FUNCTION to read a JSONArray from an URL address.
      * This function is registered by the simpleJson optional tool.
+     *
+     * @param urlString An url pointing to a json array
+     * @param characterSetName The character encoding of the resource identified by the URL
+     *
+     * @return a json array
+     * @throws SQLException on error
      */
     public static JSONArray readArrayFromURL
         ( String urlString, String characterSetName )
@@ -246,6 +280,10 @@ public abstract class SimpleJsonUtils
 
     /**
      * SQL FUNCTION to convert a JSONArray into a CLOB.
+     *
+     * @param array A json array
+     *
+     * @return a Clob containing the array as a string
      */
     public static Clob arrayToClob( JSONArray array )
     {
@@ -263,6 +301,10 @@ public abstract class SimpleJsonUtils
      * <p>
      * Turns an object into something which is a legal JSON value.
      * </p>
+     *
+     * @param obj An object holding a json value
+     * @return the json value inside the object
+     * @throws SQLException on error
      */
     private static  Object  getLegalJsonValue( Object obj )
         throws SQLException

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java Sun Jun 10 14:54:50 2018
@@ -171,6 +171,11 @@ public class SimpleJsonVTI extends VTITe
      * <p>
      * Create a SimpleJsonVTI from a JSONArray object.
      * </p>
+     *
+     * @param array a json array
+     *
+     * @return a VTI for reading the json array
+     * @throws SQLException on error
      */
     public  static  SimpleJsonVTI   readArray( JSONArray array )
         throws SQLException

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java Sun Jun 10 14:54:50 2018
@@ -36,14 +36,14 @@ import org.apache.derby.iapi.services.pr
 import org.apache.derby.impl.drda.NetworkServerControlImpl;
 
 /** 
+    <P>
     NetworkServerControl provides the ability to start a Network Server or 
     connect to a running Network Server to shutdown, configure or retrieve 
     diagnostic information.  With the exception of ping, these commands 
     can  only be performed from the  machine on which the server is running.  
     Commands can be performed from  the command line with the following 
     arguments:
-
-    <P>
+    </P>
     <UL>
     <LI>start [-h &lt;host&gt;] [-p &lt;portnumber&gt;] [-ssl &lt;sslmode&gt;]:  This starts the Network
     Server on the port/host specified or on localhost, port 1527 if no
@@ -101,13 +101,14 @@ import org.apache.derby.impl.drda.Networ
     Otherwise the default is the current directory.</LI>
 
     </UL>
-    </P>
+
     <P>Properties can be set in the derby.properties file or on the command line.
     Properties on the command line take precedence over properties in the 
     derby.properties file.  Arguments on the command line take precedence
     over properties. 
     The following is a list of properties that can be set for 
     NetworkServerControl:
+    </P>
 
     <UL><LI>derby.drda.portNumber=&lt;port number&gt;: This property 
     indicates which port should be used for the Network Server. </LI>
@@ -145,39 +146,38 @@ import org.apache.derby.impl.drda.Networ
     
 </LI>
 </UL>
-</P>
 
 <P><B>Examples.</B></P>
 
     <P>This is an example of shutting down the server on port 1621.
+    </P>
     <PRE> 
     java org.apache.derby.drda.NetworkServerControl shutdown -p 1621
     </PRE>
-    </P>
 
     <P>This is an example of turning tracing on for session 3
+    </P>
     <PRE>
     java org.apache.derby.drda.NetworkServerControl  trace on -s 3 
     </PRE>
-    </P>
 
     <P>This is an example of starting and then shutting down the Network 
        Server on port 1621 on machine myhost   
+    </P>
     <PRE>
     java org.apache.derby.drda.NetworkServerControl  start -h myhost -p 1621
     java org.apache.derby.drda.NetworkServerControl  shutdown -h myhost -p 1621
     </PRE>
-    </P>
 
     <P> This is an example of starting and shutting down the Network Server in the example
     above with the API.
+    </P>
     <PRE>
     
     NetworkServerControl serverControl = new NetworkServerControl(InetAddress.getByName("myhost"),1621)
 
     serverControl.shutdown();
     </PRE>
-    </P>
 
     
 */
@@ -250,11 +250,11 @@ public class NetworkServerControl{
      * </P>
      * <P>
      * To configure for port 1621 and listen on the loopback address:
+     * </P>
      *<PRE>
      *  NetworkServerControl  util = new
      * NetworkServerControl(InetAddress.getByName("localhost"), 1621);
      * </PRE>
-     * </P>
      *
      * @param address     The IP address of the Network Server host.
      *                     address cannot be null.
@@ -272,18 +272,19 @@ public class NetworkServerControl{
 
     /**
      * 
+     * <P>
      * Creates a NetworkServerControl object that is configured to control
      * a Network Server on the default host(localhost)
      * and the default port(1527) unless derby.drda.portNumber and 
      * derby.drda.host are set.
-     * <P><PRE>
+     * </P>
+     *<PRE>
      * new NetworkServerControl() 
      *
      * is equivalent to calling
      *
      * new NetworkServerControl(InetAddress.getByName("localhost"),1527);
      * </PRE>
-     * </P>
      *
      * @throws             Exception on error
      */

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java Sun Jun 10 14:54:50 2018
@@ -385,11 +385,17 @@ public final class NetworkServerControlI
         }
     }
 
-    /** Get the log writer we're using */
+    /**
+     * Get the log writer we're using
+     *
+     * @return the log writer
+     */
     public  PrintWriter logWriter() { return logWriter; }
 
     /**
      * Get the host where we listen for connections.
+     *
+     * @return the host name
      */
     public  String  getHost() { return hostArg; }
 
@@ -404,6 +410,8 @@ public final class NetworkServerControlI
     /**
      * Return true if the customer forcibly overrode our decision to install a
      * default SecurityManager.
+     *
+     * @return  true if the customer forcibly overrode our decision
      */
     public  boolean runningUnsecure() { return unsecureArg; }
     
@@ -567,7 +575,7 @@ public final class NetworkServerControlI
      * and throw an exception for this error
      *
      * @param msg   error message
-     * @exception Exception
+     * @exception Exception on error
      */
     public void consoleError(String msg)
         throws Exception
@@ -576,22 +584,46 @@ public final class NetworkServerControlI
         throw new Exception(msg);
     }
 
-    /** Return the debug state */
+    /**
+     * Return the debug state
+     *
+     * @return true if we are in debug mode
+     */
     public  boolean debugOutput()   { return debugOutput; }
 
-    /** Return the att_extnam server attribute */
+    /**
+     * Return the att_extnam server attribute
+     *
+     * @return the att_extnam server attribut
+     */
     public  static  String  att_extnam()    { return att_extnam; }
     
-    /** Return the att_srvclsnm server attribute */
+    /**
+     * Return the att_srvclsnm server attribute
+     *
+     * @return the att_srvclsnm server attribute
+     */
     public  static  String  att_srvclsnm()    { return att_srvclsnm; }
     
-    /** Return the att_srvrlslv server attribute */
+    /**
+     * Return the att_srvrlslv server attribute
+     *
+     * @return the att_srvrlslv server attribute
+     */
     public  static  String  att_srvrlslv()    { return att_srvrlslv; }
     
-    /** Return the product id */
+    /**
+     * Return the product id
+     *
+     * @return the product id
+     */
     public  static  String  prdId()    { return prdId; }
 
-    /** Return the bytes of the product id */
+    /**
+     * Return the bytes of the product id
+     *
+     * @return the bytes of the product id
+     */
     public  static  byte[]  prdIdBytes() { return (byte[]) prdIdBytes_.clone(); }
     
     /**
@@ -1051,6 +1083,11 @@ public final class NetworkServerControlI
     
 
 
+    /**
+     * Start the network server.
+     *
+     * @throws Exception on error
+     */
     protected void startNetworkServer() throws Exception
     {
 
@@ -1270,6 +1307,8 @@ public final class NetworkServerControlI
     /*
      Shutdown the server directly (If you have the original object)
      No Network communication needed.
+
+     @throws java.sql.SQLException on error
     */
     public void directShutdown() throws SQLException {
         // DERBY-2109: the public shutdown method now checks privileges
@@ -1292,6 +1331,10 @@ public final class NetworkServerControlI
 
 
     /**
+     * Return true if the server has started.
+     *
+     * @return true if the server has started
+     * @throws Exception on error
      */
     public boolean isServerStarted() throws Exception
     {
@@ -1306,7 +1349,7 @@ public final class NetworkServerControlI
 
     /**
      * Ping opening an new socket and close it.
-     * @throws Exception
+     * @throws Exception on error
      */
     public void ping() throws Exception
     {
@@ -1439,6 +1482,9 @@ public final class NetworkServerControlI
 
     /**
      *@see NetworkServerControl#setTraceDirectory
+     *
+     * @param traceDirectory Where to write traces
+     * @throws Exception on error
      */
     public void sendSetTraceDirectory(String traceDirectory)
         throws Exception
@@ -1457,6 +1503,9 @@ public final class NetworkServerControlI
 
     /**
      *@see NetworkServerControl#getSysinfo
+     *
+     * @return system information
+     * @throws Exception on error
      */
     public String sysinfo()
         throws Exception
@@ -1473,6 +1522,9 @@ public final class NetworkServerControlI
 
     /**
      *@see NetworkServerControl#getRuntimeInfo
+     *
+     * @return the runtime information
+     * @throws Exception on error
      */
     public String runtimeInfo()
     throws Exception 
@@ -1641,7 +1693,7 @@ public final class NetworkServerControlI
      *  from DSS structures.
      *  The protocol for the parameters for each command follows:
      *
-     *  Command: trace <connection id> {on | off}
+     *  Command: trace $connectionID {on | off}
      *  Protocol:
      *      4 bytes     - connection id - connection id of 0 means all sessions
      *      1 byte      - 0 off, 1 on
@@ -2057,7 +2109,9 @@ public final class NetworkServerControlI
     /**
      * Is this the command protocol
      * 
-     * @param  val
+     * @param  val A command string
+     *
+     * @return true if the command is the protocol command
      */
     protected static boolean isCmd(String val)
     {
@@ -2298,6 +2352,7 @@ public final class NetworkServerControlI
      * @param args  array of arguments indicating command to be executed
      *
      * @return the command to be executed
+     * @throws Exception on error
      */
     public int parseArgs(String args[]) throws Exception
     {
@@ -2903,8 +2958,8 @@ public final class NetworkServerControlI
     /** Write string
      *
      * @param msg String to write
+     * @throws Exception on error
      */
-
     protected void writeString(String msg) throws Exception
     {
         byte[] msgBytes = msg.getBytes(DEFAULT_ENCODING);
@@ -3613,6 +3668,7 @@ public final class NetworkServerControlI
      * @param msgProp   message key
      * @param args      arguments to message
      *
+     * @return the localized message
      */
     public String localizeMessage( String msgProp, String[] args )
     {
@@ -3838,6 +3894,8 @@ public final class NetworkServerControlI
     /** 
      * Get the current value of keepAlive to configure how long the server
      * should keep the socket alive for a disconnected client
+     *
+     * @return the current value of keepAlive
      */
     protected boolean getKeepAlive()
     {

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ProtocolTestAdapter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ProtocolTestAdapter.java?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ProtocolTestAdapter.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ProtocolTestAdapter.java Sun Jun 10 14:54:50 2018
@@ -58,7 +58,13 @@ public class ProtocolTestAdapter {
     private final DDMReader reader;
     private final OutputStream out;
 
-    /** Initializes the adapter for use with the given socket. */
+    /**
+     * Initializes the adapter for use with the given socket.
+     *
+     * @param socket The socket
+     *
+     * @throws IOException on error
+     */
     public ProtocolTestAdapter(Socket socket)
             throws IOException {
         this.socket = socket;
@@ -66,7 +72,11 @@ public class ProtocolTestAdapter {
         this.out = socket.getOutputStream();
     }
 
-    /** Closes the resources associated with the adapter. */
+    /**
+     * Closes the resources associated with the adapter.
+     *
+     * @throws IOException on error
+     */
     public void close()
             throws IOException {
         // According to the JavaDoc this will also close the associated streams.
@@ -102,7 +112,13 @@ public class ProtocolTestAdapter {
         return null;
     }
 
-    /** Converts a string to a byte array according to the CCSID manager. */
+    /**
+     * Converts a string to a byte array according to the CCSID manager.
+     *
+     * @param str String to convert
+     *
+     * @return a byte array according to the CCSID manager.
+     */
     public byte[] convertFromJavaString(String str) {
         return ccsidManager.convertFromJavaString(str);
     }

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/package.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/package.html?rev=1833280&r1=1833279&r2=1833280&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/package.html (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/package.html Sun Jun 10 14:54:50 2018
@@ -37,28 +37,22 @@
 incoming DRDA Requests into embedded JDBC calls and then translates
 results back into DRDA for return to the client. Below is a summary
 of the implementation.</P>
-<P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT SIZE=4>Classes
-Summary</FONT></FONT></P>
+<P STYLE="margin-top: 0.17in; page-break-after: avoid; font-size:large">Classes
+Summary</P>
 <P><B>NetworkServerControlImpl</B> - This class implements methods
 used by the public API and main.  It's functions include:</P>
 <UL>
-    <UL>
-        <LI><P>Launching a ConnectionThread to accept incomming
-        connections.</P>
-    </UL>
+        <LI>Launching a ConnectionThread to accept incomming
+        connections.</LI>
 </UL>
 <UL>
-    <UL>
-        <LI><P>Manaintaining  a list of sessions, a queue of Sessions
+        <LI>Manaintaining  a list of sessions, a queue of Sessions
         waiting for free thread and free list of DRDAConnections which are
-        available for reuse.</P>
-    </UL>
+        available for reuse.</LI>
 </UL>
 <UL>
-    <UL>
-        <LI><P>Handling non-DRDA proprietary protocol requests (e.g.
-        turning tracing on/off)</P>
-    </UL>
+        <LI>Handling non-DRDA proprietary protocol requests (e.g.
+        turning tracing on/off)</LI>
 </UL>
 <P><BR><BR>
 </P>
@@ -66,14 +60,12 @@ used by the public API and main.  It's f
 to accept connections. It is responsible for 
 </P>
 <UL>
-    <UL>
-        <LI><P> accepting connections</P>
-        <LI><P>    creating a new Sessions and adding them to the session
-        table.</P>
-        <LI><P>     Starting a DRDAConnThread (either one from the free
+        <LI>accepting connections</LI>
+        <LI>creating a new Sessions and adding them to the session
+        table.</LI>
+        <LI>Starting a DRDAConnThread (either one from the free
         list or a new one) or putting the sessions waiting for a thread if
-        maxThreads is exceeded.</P>
-    </UL>
+        maxThreads is exceeded.</LI>
 </UL>
 <P><B>ApplicationRequester</B> - this contains information about a
 particular application requester(e.g, type, version, level of
@@ -145,7 +137,7 @@ The DRDA protocol requires that the rece
 data into it's format (i.e., the writer writes data in its own
 format).  Data has to be converted from the writer format to the
 local format.</P>
-<P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT SIZE=4>Scheduling</FONT></FONT></P>
+<P STYLE="margin-top: 0.17in; page-break-after: avoid; font-size:large">Scheduling</P>
 <P>The scheduling algorithm used is first in first out.  When a
 client session connects to the server, the server checks to see if
 there are any DRDAConnThreads which are free to handle the session. 
@@ -169,8 +161,8 @@ a cursor, each fetch would represent a s
 <P>A timeout of the timeslice is set on the client socket so that the
 connection thread won't be blocked for more than the timeslice by an
 idle client.</P>
-<P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT SIZE=4>Coordinating
-information between Server and Connection Threads</FONT></FONT></P>
+<P STYLE="margin-top: 0.17in; page-break-after: avoid; font-size:large">Coordinating
+information between Server and Connection Threads</P>
 <P>Several commands change information needed by the connection
 threads.  For example, timeslice can be changed.  This is handled by
 keeping a copy of the value in the connection thread.  If the value
@@ -179,8 +171,8 @@ changing the value in the thread's copy.
 instead of one synchronization point in the server which all threads
 will block on to read, each thread has a copy which it can separately
 sync on.</P>
-<P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT SIZE=4>Command
-Protocol</FONT></FONT></P>
+<P STYLE="margin-top: 0.17in; page-break-after: avoid; font-size:large">Command
+Protocol</P>
 <P>The command protocol is used to send commands such as shutdown,
 turn tracing on, etc. to a running network server.    The client
 sends:</P>
@@ -206,8 +198,8 @@ be serialized. This shouldn't be a probl
 fairly rare.</P>
 <P><BR><BR>
 </P>
-<P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT SIZE=4>DRDA
-Protocol</FONT></FONT></P>
+<P STYLE="margin-top: 0.17in; page-break-after: avoid; font-size:large">DRDA
+Protocol</P>
 <P>The DRDA protocol is described at great length in the DRDA
 Reference manuals.  DRDA Protocol is divided into three layers
 corresponding to the DDM three-tier architecture. For each layer,
@@ -254,7 +246,7 @@ element is zeroed as the required object
 to see if there are any required objects missing and an error message
 is produced indicating the missing codepoints if some have not been
 sent.</P>
-<P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT SIZE=4>Packages</FONT></FONT></P>
+<P STYLE="margin-top: 0.17in; page-break-after: avoid; font-size:large">Packages</P>
 <P>In DRDA, dynamic SQL is bound to predefined  packages.  Since
 Derby doesn't support packages, PACKAGE messages will be handled
 entirely in the network server.The network server will just validate