--no commit message

--no commit message

h2/build.xml

@@ -243,6 +243,7 @@
 	</target>
 
 	<target name="javadoc">
+		<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true" includes="org/h2/util/StringUtils.java"/>
 		<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/test" destdir="bin" debug="true" includes="org/h2/test/bnf/*.java"/>
 		<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/tools" destdir="bin" debug="true" includes="org/h2/tools/doclet/*.java"/>
 		<mkdir dir="docs/javadoc"/>

h2/src/docsrc/html/advanced.html

@@ -50,6 +50,8 @@ Advanced Topics
     Universally Unique Identifiers (UUID)</a><br />
 <a href="#system_properties">
     Settings Read from System Properties</a><br />
+<a href="#server_bind_address">
+    Setting the Server Bind Address</a><br />
 <a href="#glossary_links">
     Glossary and Links</a><br />
 
@@ -927,39 +929,22 @@ Example:
 java -Dh2.serverCachedObjects=256 org.h2.tools.Server
 </pre>
 The current value of the settings can be read in the table
-INFORMATION_SCHEMA.SETTINGS
-</p>
-<table><tr>
-<th>Setting</th>
-<th>Default</th>
-<th>Description</th></tr>
-<tr><td>h2.allowedClasses</td><td>*</td><td>Comma separated list of class names or prefixes</td></tr>
-<tr><td>h2.check</td><td>true</td><td>Assertions in the database engine</td></tr>
-<tr><td>h2.check2</td><td>false</td><td>Additional assertions</td></tr>
-<tr><td>h2.clientTraceDirectory</td><td>trace.db/</td><td>Directory where the trace files of the JDBC client are stored (only for client / server)</td></tr>
-<tr><td>h2.emergencySpaceInitial</td><td>1048576</td><td>Size of 'reserve' file to detect disk full problems early</td></tr>
-<tr><td>h2.emergencySpaceMin</td><td>131072</td><td>Minimum size of 'reserve' file</td></tr>
-<tr><td>h2.lobCloseBetweenReads</td><td>false</td><td>Close LOB files between read operations</td></tr>
-<tr><td>h2.lobFilesInDirectories</td><td>false</td><td>Store LOB files in subdirectories</td></tr>
-<tr><td>h2.lobFilesPerDirectory</td><td>256</td><td>Maximum number of LOB files per directory</td></tr>
-<tr><td>h2.logAllErrors</td><td>false</td><td>Write stack traces of any kind of error to a file</td></tr>
-<tr><td>h2.logAllErrorsFile</td><td>h2errors.txt</td><td>File name to log errors</td></tr>
-<tr><td>h2.maxFileRetry</td><td>16</td><td>Number of times to retry file delete and rename</td></tr>
-<tr><td>h2.objectCache</td><td>true</td><td>Cache commonly used objects (integers, strings)</td></tr>
-<tr><td>h2.objectCacheMaxPerElementSize</td><td>4096</td><td>Maximum size of an object in the cache</td></tr>
-<tr><td>h2.objectCacheSize</td><td>1024</td><td>Size of object cache</td></tr>
-<tr><td>h2.optimizeEvaluatableSubqueries</td><td>true</td><td>Optimize subqueries that are not dependent on the outer query</td></tr>
-<tr><td>h2.optimizeIn</td><td>true</td><td>Optimize IN(...) comparisons</td></tr>
-<tr><td>h2.optimizeMinMax</td><td>true</td><td>Optimize MIN and MAX aggregate functions</td></tr>
-<tr><td>h2.optimizeSubqueryCache</td><td>true</td><td>Cache subquery results</td></tr>
-<tr><td>h2.overflowExceptions</td><td>true</td><td>Throw an exception on integer overflows</td></tr>
-<tr><td>h2.recompileAlways</td><td>false</td><td>Always recompile prepared statements</td></tr>
-<tr><td>h2.redoBufferSize</td><td>262144</td><td>Size of the redo buffer (used at startup when recovering)</td></tr>
-<tr><td>h2.runFinalize</td><td>true</td><td>Run finalizers to detect unclosed connections</td></tr>
-<tr><td>h2.scriptDirectory</td><td></td><td>Relative or absolute directory where the script files are stored to or read from</td></tr>
-<tr><td>h2.serverCachedObjects</td><td>64</td><td>TCP Server: number of cached objects per session</td></tr>
-<tr><td>h2.serverResultSetFetchSize</td><td>100</td><td>The default result set fetch size when using the server mode</td></tr>
-</table>
+INFORMATION_SCHEMA.SETTINGS.
+</p>
+<p>
+For a complete list of settings, see
+<a href="../javadoc/org/h2/constant/SysProperties.html">SysProperties</a>.
+</p>
+
+<br /><a name="server_bind_address"></a>
+<h2>Setting the Server Bind Address</h2>
+<p>
+Usually server sockets accept connections on any/all local addresses.
+This may be a problem on multi-homed hosts.
+To bind only to one address, use the system property h2.bindAddress.
+This setting is used for both regular server sockets and for SSL server sockets.
+IPv4 and IPv6 address formats are supported.
+</p>
 
 <br /><a name="glossary_links"></a>
 <h2>Glossary and Links</h2>

h2/src/docsrc/html/features.html

@@ -71,8 +71,6 @@ Features
     Compacting a Database</a><br />
 <a href="#cache_settings">
     Cache Settings</a><br />
-<a href="#why_java">
-    Why Java</a><br />
 
 <br /><a name="feature_list"></a>
 <h2>Feature List</h2>
@@ -880,10 +878,6 @@ Here is the list of currently supported modes and the difference to the regular
   Usually, the scale is converted and 0s are added if required.
 </td></tr>
 </table>
-<p>
-
-
-</p>
 
 <br /><a name="trace_options"></a>
 <h2>Using the Trace Options</h2>
@@ -1346,39 +1340,4 @@ call SELECT * FROM INFORMATION_SCHEMA.SETTINGS. The number of pages read / writt
 is listed for the data and index file.
 </p>
 
-<br /><a name="why_java"></a>
-<h2>Why Java</h2>
-<p>
-A few reasons using a Java database are:
-</p>
-<ul>
-<li>Very simple to integrate in Java applications
-</li><li>Support for many different platforms
-</li><li>More secure than native applications (no buffer overflows)
-</li><li>User defined functions (or triggers) run very fast
-</li><li>Unicode support
-</li></ul>
-<p>
-Some people think that Java is still too slow for low level operations,
-but this is not the case (not any more). In general, the code can be written a lot faster
-than using C or C++. Like that, it is possible to concentrate on improving the algorithms
-(that make the application faster) rather than porting the code and dealing with low
-level stuff (such as memory management or dealing with threads).
-Garbage collection is now probably faster than manual memory management.
-</p><p>
-A lot of features are already built in (for example Unicode, network libraries).
-It is very easy to write secure code because buffer overflows and such
-problems can be detected very easily. Some features such as the reflection
-mechanism can be used for randomized testing.
-</p><p>
-Java is also future proof: A lot of companies support Java,
-and it is now open source.
-</p><p>
-This software does not rely on many Java libraries or other software, to
-increase the portability and ease of use, and for performance reasons. For example,
-the encryption algorithms and many library functions are implemented in the database
-instead of using the existing libraries. Libraries that are not available in open source
-Java implementations (such as Swing) are not used or only used for specific features.
-</p>
-
 </div></td></tr></table></body></html>

h2/src/docsrc/html/history.html

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- 
-Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). 
+<!--
+Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
 Initial Developer: H2 Group
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
@@ -14,6 +14,8 @@ History
 <h1>History and Roadmap</h1>
 <a href="#history">
     History of this Database Engine</a><br />
+<a href="#why_java">
+    Why Java</a><br />
 <a href="#changelog">
     Change Log</a><br />
 <a href="#roadmap">
@@ -34,6 +36,40 @@ The name H2 stands for Hypersonic 2; however H2 does not share any code with
 Hypersonic SQL or HSQLDB. H2 is built from scratch.
 </p>
 
+<br /><a name="why_java"></a>
+<h2>Why Java</h2>
+<p>
+A few reasons using a Java database are:
+</p>
+<ul>
+<li>Very simple to integrate in Java applications
+</li><li>Support for many different platforms
+</li><li>More secure than native applications (no buffer overflows)
+</li><li>User defined functions (or triggers) run very fast
+</li><li>Unicode support
+</li></ul>
+<p>
+Some people think that Java is still too slow for low level operations,
+but this is not the case (not any more). In general, the code can be written a lot faster
+than using C or C++. Like that, it is possible to concentrate on improving the algorithms
+(that make the application faster) rather than porting the code and dealing with low
+level stuff (such as memory management or dealing with threads).
+Garbage collection is now probably faster than manual memory management.
+</p><p>
+A lot of features are already built in (for example Unicode, network libraries).
+It is very easy to write secure code because buffer overflows can not occur.
+Some features such as the reflection mechanism can be used for randomized testing.
+</p><p>
+Java is also future proof: A lot of companies support Java,
+and it is now open source.
+</p><p>
+This software does not rely on many Java libraries or other software, to
+increase the portability and ease of use, and for performance reasons. For example,
+the encryption algorithms and many library functions are implemented in the database
+instead of using the existing libraries. Libraries that are not available in open source
+Java implementations (such as Swing) are not used or only used for specific features.
+</p>
+
 <br /><a name="changelog"></a>
 <h2>Change Log</h2>
 <p>

h2/src/docsrc/javadoc/classes.html

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). 
+<!--
+Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
 Initial Developer: H2 Group
 -->
 <html>
@@ -64,6 +64,12 @@ Package org.h2.api<br />
 <a href="org/h2/api/Trigger.html" target="javadoc">Trigger</a><br />
 <br />
 
+<b>Constants</b><br />
+Package org.h2.constant<br />
+<a href="org/h2/constant/ErrorCode.html" target="javadoc">ErrorCode</a><br />
+<a href="org/h2/constant/SysProperties.html" target="javadoc">SysProperties</a><br />
+<br />
+
 </div>
 
 </div></td></tr></table>

h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java

@@ -221,6 +221,11 @@ public class AlterTableAlterColumn extends SchemaCommand {
             DbObject child = (DbObject) children.get(i);
             if (child instanceof Sequence) {
                 continue;
+            } else if (child instanceof Index) {
+                Index idx = (Index) child;
+                if (idx.getIndexType().belongsToConstraint()) {
+                    continue;
+                }
             }
             String createSQL = child.getCreateSQL();
             if (createSQL == null) {

h2/src/main/org/h2/command/dml/Select.java

@@ -576,7 +576,7 @@ public class Select extends Query {
             if (index != null && (current.getIndexType().isScan() || current == index)) {
                 topTableFilter.setIndex(index);
                 if (!distinct || isDistinctQuery) {
-                    // sort using index wouldn't work correctly for distinct result sets
+                    // sort using index would not work correctly for distinct result sets
                     // because it would break too early when limit is used
                     sortUsingIndex = true;
                 }

h2/src/main/org/h2/util/JdbcUtils.java

@@ -97,7 +97,11 @@ public class JdbcUtils {
                         DataSource ds = (DataSource) context.lookup(url);
                         String user = prop.getProperty("user");
                         String password = prop.getProperty("password");
-                         return ds.getConnection(user, password);
+                        if (StringUtils.isNullOrEmpty(user) && StringUtils.isNullOrEmpty(password)) {
+                            return ds.getConnection();
+                        } else {
+                            return ds.getConnection(user, password);
+                        }
                      } catch (InstantiationException e) {
                          throw Message.convert(e);
                      } catch (IllegalAccessException e) {

h2/src/test/org/h2/samples/FunctionMultiReturn.java

@@ -116,7 +116,7 @@ public class FunctionMultiReturn {
      *
      * @param conn the connection
      * @param query the query
-     * @return a result set with the coodinates
+     * @return a result set with the coordinates
      */
     public static ResultSet polar2CartesianSet(Connection conn, String query) throws SQLException {
         SimpleResultSet result = new SimpleResultSet();

h2/src/test/org/h2/test/TestAll.java

@@ -51,7 +51,6 @@ import org.h2.test.db.TestView;
 import org.h2.test.jdbc.TestBatchUpdates;
 import org.h2.test.jdbc.TestCallableStatement;
 import org.h2.test.jdbc.TestCancel;
-import org.h2.test.jdbc.TestDataSource;
 import org.h2.test.jdbc.TestDatabaseEventListener;
 import org.h2.test.jdbc.TestManyJdbcObjects;
 import org.h2.test.jdbc.TestMetaData;
@@ -62,7 +61,9 @@ import org.h2.test.jdbc.TestStatement;
 import org.h2.test.jdbc.TestTransactionIsolation;
 import org.h2.test.jdbc.TestUpdatableResultSet;
 import org.h2.test.jdbc.TestZloty;
-import org.h2.test.jdbc.xa.TestXA;
+import org.h2.test.jdbcx.TestDataSource;
+import org.h2.test.jdbcx.TestXA;
+import org.h2.test.jdbcx.TestXASimple;
 import org.h2.test.mvcc.TestMvcc1;
 import org.h2.test.mvcc.TestMvcc2;
 import org.h2.test.server.TestNestedLoop;
@@ -149,6 +150,21 @@ java org.h2.test.TestAll timer
 
 /*
 
+h2CallableStatementBatchTest.zip
+h2-2007-12-27_test.zip
+
+History:
+The H2 Console now calls DataSource.getConnection() instead of DataSource.getConnection(user, password)
+when user name and password are not specified.
+The bind IP address can now be set when using multi-homed host (if multiple network adapters are available)
+using the system property h2.bindAddress.
+Batch update: Calling BatchUpdateException.printStackTrace() could result in out of memory. Fixed.
+Indexes of unique or foreign constraints where not dropped when the constraint was dropped after
+altering the table (for example dropping a column). Fixed.
+
+Roadmap:
+Automatically switch source code before compiling
+
 staging.trace.db.gz
 
 drop table logs;
@@ -159,25 +175,10 @@ ANALYZE SAMPLE_SIZE 0;
 script nodata;
 EXPLAIN SELECT id FROM Logs WHERE procid=2 AND id<100;
 
-h2CallableStatementBatchTest.zip
-h2-2007-12-27_test.zip
-
-docs,
-History:
-The bind IP address can now be set when using multi-homed host (if multiple network adapters are available)
-using the system property h2.bindAddress.
-Batch update: Calling BatchUpdateException.printStackTrace() could result in out of memory. Fixed.
-
-Create system property documentation from Javadocs.
-
 allow queries as well in batch updates
 CALL syntax should probably work for regular executeUpdate as well.
 http://java.sun.com/j2se/1.4.2/docs/guide/jdbc/getstart/callablestatement.html#1000220
 
-Automatically switch source code before compiling
-    [echo] Java version is 1.6 but source code is switched to 1.4.
-    [echo] Run ant codeswitchJdk... first.
-
 write to the db file what version was used to create a database
 
 Web site:
@@ -540,17 +541,11 @@ Features of H2
         new TestTwoPhaseCommit().runTest(this);
         new TestView().runTest(this);
 
-        // server
-        new TestNestedLoop().runTest(this);
-        new TestWeb().runTest(this);
-        new TestPgServer().runTest(this);
-
         // jdbc
         new TestBatchUpdates().runTest(this);
         new TestCallableStatement().runTest(this);
         new TestCancel().runTest(this);
         new TestDatabaseEventListener().runTest(this);
-        new TestDataSource().runTest(this);
         new TestManyJdbcObjects().runTest(this);
         new TestMetaData().runTest(this);
         new TestNativeSQL().runTest(this);
@@ -559,14 +554,23 @@ Features of H2
         new TestStatement().runTest(this);
         new TestTransactionIsolation().runTest(this);
         new TestUpdatableResultSet().runTest(this);
-        new TestXA().runTest(this);
         new TestZloty().runTest(this);
 
+        // jdbcx
+        new TestDataSource().runTest(this);
+        new TestXA().runTest(this);
+        new TestXASimple().runTest(this);
+
+        // server
+        new TestNestedLoop().runTest(this);
+        new TestWeb().runTest(this);
+        new TestPgServer().runTest(this);
+
         // mvcc
         new TestMvcc1().runTest(this);
         new TestMvcc2().runTest(this);
 
-        // synthetic
+        // synth
         new TestCrashAPI().runTest(this);
         new TestRandomSQL().runTest(this);
         new TestKillRestart().runTest(this);

h2/src/test/org/h2/test/jdbc/TestDataSource.java → h2/src/test/org/h2/test/jdbcx/TestDataSource.java

@@ -2,7 +2,7 @@
  * Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.test.jdbc;
+package org.h2.test.jdbcx;
 
 import java.sql.Connection;
 import java.sql.Statement;

h2/src/test/org/h2/test/jdbc/xa/TestXA.java → h2/src/test/org/h2/test/jdbcx/TestXA.java

@@ -2,7 +2,7 @@
  * Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: James Devenish
  */
-package org.h2.test.jdbc.xa;
+package org.h2.test.jdbcx;
 
 import java.sql.Connection;
 import java.sql.SQLException;

h2/src/test/org/h2/test/jdbc/TestXASimple.java → h2/src/test/org/h2/test/jdbcx/TestXASimple.java

@@ -2,20 +2,24 @@
  * Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.test.jdbc;
+package org.h2.test.jdbcx;
 
 import java.sql.Connection;
 
+import javax.sql.XAConnection;
+
 import org.h2.jdbcx.JdbcDataSource;
+import org.h2.test.TestBase;
 
 /**
  * A simple XA test.
  */
-public class TestXASimple {
+public class TestXASimple extends TestBase {
 
-    private int notYetImplemented;
+    public void test() throws Exception {
 
-    public static void main(String[] args) throws Exception {
+        deleteDb("xaDb1");
+        deleteDb("xaDb2");
         Class.forName("org.h2.Driver");
 
         // InitialContext context = new InitialContext();
@@ -24,20 +28,22 @@ public class TestXASimple {
         JdbcDataSource ds1 = new JdbcDataSource();
         ds1.setPassword("");
         ds1.setUser("sa");
-        ds1.setURL("jdbc:h2:db1H2");
+        ds1.setURL("jdbc:h2:" + baseDir + " /xaDb1");
 
         JdbcDataSource ds2 = new JdbcDataSource();
         ds2.setPassword("");
         ds2.setUser("sa");
-        ds2.setURL("jdbc:h2:db2H2");
+        ds2.setURL("jdbc:h2:" + baseDir + "/xaDb2");
 
         // UserTransaction ut = (UserTransaction)
         // context.lookup("UserTransaction");
         // ut.begin();
 
-        Connection c1 = ds1.getXAConnection().getConnection();
+        XAConnection xa1 = ds1.getXAConnection();
+        Connection c1 = xa1.getConnection();
         c1.setAutoCommit(false);
-        Connection c2 = ds2.getXAConnection().getConnection();
+        XAConnection xa2 = ds2.getXAConnection();
+        Connection c2 = xa2.getConnection();
         c2.setAutoCommit(false);
 
         c1.createStatement().executeUpdate("create table test(id int, test varchar(255))");
@@ -47,8 +53,13 @@ public class TestXASimple {
         c1.close();
         c2.close();
 
+        xa1.close();
+        xa2.close();
+
         // j.stop();
         // System.exit(0);
+        deleteDb("xaDb1");
+        deleteDb("xaDb2");
 
     }
 }

h2/src/test/org/h2/test/jdbc/xa/TestXid.java → h2/src/test/org/h2/test/jdbcx/TestXid.java

@@ -2,7 +2,7 @@
  * Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: James Devenish
  */
-package org.h2.test.jdbc.xa;
+package org.h2.test.jdbcx;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

h2/src/test/org/h2/test/test.in.txt

@@ -2825,11 +2825,10 @@ script NOPASSWORDS NOSETTINGS drop;
 > CREATE SCHEMA S AUTHORIZATION SA;
 > CREATE SEQUENCE S.SEQ START WITH 10;
 > CREATE TRIGGER S.TEST_TRIGGER BEFORE INSERT ON S.TEST QUEUE 1024 CALL "org.h2.test.db.TestTriggersConstraints";
-> CREATE UNIQUE INDEX S.CU_ID_INDEX_2 ON S.TEST(ID);
 > CREATE USER IF NOT EXISTS SA PASSWORD '' ADMIN;
 > DROP SEQUENCE IF EXISTS S.SEQ;
 > DROP TABLE IF EXISTS S.TEST;
-> rows: 10
+> rows: 9
 
 drop trigger s.test_trigger;
 > ok

h2/src/test/org/h2/test/testSimple.in.txt

+CREATE TABLE TEST(A int NOT NULL, B int NOT NULL, C int) ;
+ALTER TABLE TEST ADD CONSTRAINT CON UNIQUE(A,B);
+ALTER TABLE TEST DROP C;
+ALTER TABLE TEST DROP CONSTRAINT CON;
+ALTER TABLE TEST DROP B;
+DROP TABLE TEST;
+
 select count(d.*) from dual d group by d.x;
 > 1;
 

h2/src/test/org/h2/test/unit/TestDate.java

@@ -15,7 +15,7 @@ import org.h2.value.Value;
  * Tests the data parsing.
  * The problem is that some dates are not allowed because of the summer time change.
  * Most countries change at 2 o'clock in the morning to 3 o'clock, but some
- * (for example Chile) change at midnight. Non-lenient parsing wouldn't work in this case.
+ * (for example Chile) change at midnight. Non-lenient parsing would not work in this case.
  */
 public class TestDate extends TestBase {
 

h2/src/tools/org/h2/tools/doc/dictionary.txt

@@ -520,4 +520,6 @@ involves ukrainian chile machines restricting summer aliased backus naur multipl
 countdown paused javac analyzing accesses solving forcefully urgent originally defect coordinates
 camel council merges spelled adaptive pull controller abstractions workarounds driven
 thousands ridvan incremented slots debugging inherit agar fulvio invisible biondi hundreds occupied remap retrieved involved
-turkish fulfils iapi filesync
\ No newline at end of file
+turkish fulfils iapi filesync
+compares packets destroying echo homed hosts clock countries validated catches turning staging kills distance morning performs internationalization simulator constructed nicer
+echo callablestatement procid homed getstart staging
\ No newline at end of file

h2/src/tools/org/h2/tools/doclet/Doclet.java

@@ -12,6 +12,8 @@ import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.Comparator;
 
+import org.h2.util.StringUtils;
+
 import com.sun.javadoc.ClassDoc;
 import com.sun.javadoc.FieldDoc;
 import com.sun.javadoc.MethodDoc;
@@ -74,7 +76,7 @@ public class Doclet {
                 .println("<table class=\"content\"><tr class=\"content\"><td class=\"content\"><div class=\"contentDiv\">");
 
         writer.println("<h1>" + className + "</h1>");
-        writer.println(clazz.commentText() + "<br /><br />");
+        writer.println(formatText(clazz.commentText()) + "<br /><br />");
 
         MethodDoc[] methods = clazz.methods();
         Arrays.sort(methods, new Comparator() {
@@ -82,13 +84,17 @@ public class Doclet {
                 return ((MethodDoc) a).name().compareTo(((MethodDoc) b).name());
             }
         });
-        writer.println("<table><tr><th colspan=\"2\">Methods</th></tr>");
+        boolean hasMethods = false;
         for (int i = 0; i < methods.length; i++) {
             MethodDoc method = methods[i];
             String name = method.name();
             if (skipMethod(method)) {
                 continue;
             }
+            if (!hasMethods) {
+                writer.println("<table><tr><th colspan=\"2\">Methods</th></tr>");
+                hasMethods = true;
+            }
             String type = getTypeName(method.isStatic(), method.returnType());
             writer.println("<tr><td class=\"return\">" + type + "</td><td class=\"method\">");
             Parameter[] params = method.parameters();
@@ -109,11 +115,13 @@ public class Doclet {
             writer.println("<a href=\"#r" + i + "\">" + name + "</a>" + buff.toString());
             String firstSentence = getFirstSentence(method.firstSentenceTags());
             if (firstSentence != null) {
-                writer.println("<div class=\"methodText\">" + firstSentence + "</div>");
+                writer.println("<div class=\"methodText\">" + formatText(firstSentence) + "</div>");
             }
             writer.println("</td></tr>");
         }
-        writer.println("</table>");
+        if (hasMethods) {
+            writer.println("</table>");
+        }
         FieldDoc[] fields = clazz.fields();
         if (clazz.interfaces().length > 0) {
             fields = clazz.interfaces()[0].fields();
@@ -136,10 +144,15 @@ public class Doclet {
             String type = getTypeName(true, field.type());
             writer.println("<tr><td class=\"return\">" + type + "</td><td class=\"method\">");
             // writer.println("<a href=\"#f" + fieldId + "\">" + name + "</a>");
-            writer.println(name + " = " + field.constantValueExpression());
+            String constant = field.constantValueExpression();
+            if (constant == null) {
+                writer.println(name);
+            } else {
+                writer.println(name + " = " + constant);
+            }
             String text = field.commentText();
             if (text != null) {
-                writer.println("<div class=\"methodText\">" + text + "</div>");
+                writer.println("<div class=\"methodText\">" + formatText(text) + "</div>");
             }
             writer.println("</td></tr>");
             fieldId++;
@@ -183,7 +196,7 @@ public class Doclet {
             }
             writer.println("<h4>" + type + " <span class=\"methodName\">" + name + "</span>" + buff.toString()
                     + "</h4>");
-            writer.println(method.commentText());
+            writer.println(formatText(method.commentText()));
             ParamTag[] paramTags = method.paramTags();
             boolean space = false;
             for (int j = 0; j < paramTags.length; j++) {
@@ -229,6 +242,14 @@ public class Doclet {
         out.close();
     }
 
+    private static String formatText(String text) {
+        if (text == null) {
+            return text;
+        }
+        text = StringUtils.replaceAll(text, "\n </pre>", "</pre>");
+        return text;
+    }
+
     private static boolean skipMethod(MethodDoc method) {
         ClassDoc clazz = method.containingClass();
          if (INTERFACES_ONLY && (!clazz.isAbstract() || !method.isAbstract()) && !clazz.isInterface()) {

h2/src/tools/org/h2/security/SecureKeyStoreBuilder.java → h2/src/tools/org/h2/tools/security/SecureKeyStoreBuilder.java

@@ -2,7 +2,7 @@
  * Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.security;
+package org.h2.tools.security;
 
 import java.security.Key;
 import java.security.KeyStore;
@@ -13,6 +13,7 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.util.Enumeration;
 
+import org.h2.security.SecureSocketFactory;
 import org.h2.util.ByteUtils;
 
 /**