--no commit message

--no commit message

h2/ant-build.properties

-#Mon Nov 19 20:09:20 CET 2007
+#Sat Nov 24 19:01:03 CET 2007
 javac=javac
 benchmark.drivers.dir=C\:/data/java
 path.servlet.jar=C\:/data/classpath/servlet-api.jar
-version.name.maven=1.0.61
+version.name.maven=1.0.62
 path.lucene.jar=C\:/data/classpath/lucene-core-2.2.0.jar
 jdk=1.4

h2/src/docsrc/html/build.html

@@ -78,7 +78,7 @@ Example:
 <dependency>
     <groupId>com.h2database</groupId>
     <artifactId>h2</artifactId>
-    <version>1.0.61</version>
+    <version>1.0.62</version>
 </dependency>
 </pre>
 <p>

h2/src/docsrc/html/download.html

@@ -15,10 +15,10 @@ H2 Database Engine
 
 <h1>Downloads</h1>
 
-<h3>Version 1.0.61 (2007-11-10, Current)</h3>
+<h3>Version 1.0.62 (2007-11-25, Current)</h3>
 <p>
-<a href="http://www.h2database.com/h2-setup-2007-11-10.exe">Windows Installer</a><br />
-<a href="http://www.h2database.com/h2-2007-11-10.zip">Platform-Independent Zip</a><br />
+<a href="http://www.h2database.com/h2-setup-2007-11-25.exe">Windows Installer</a><br />
+<a href="http://www.h2database.com/h2-2007-11-25.zip">Platform-Independent Zip</a><br />
 </p>
 
 <h3>Download Mirror</h3>

h2/src/docsrc/html/mainWeb.html

@@ -31,17 +31,17 @@ Welcome to H2, the free SQL database. The main feature of H2 are:
         <table style="border: 0px; margin: 5px; background-color: #eee;">
               <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <h3>Download</h3>
-                Version 1.0.61 (2007-11-10):
+                Version 1.0.62 (2007-11-25):
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2007-11-10.exe"><img border="1" src="images/download.png" alt="download" /></a>
+                <a href="http://www.h2database.com/h2-setup-2007-11-25.exe"><img border="1" src="images/download.png" alt="download" /></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2007-11-10.exe">Windows Installer (2.8 MB)</a>
+                <a href="http://www.h2database.com/h2-setup-2007-11-25.exe">Windows Installer (2.8 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2007-11-10.zip"><img border="1" src="images/download.png" alt="download" /></a>
+                <a href="http://www.h2database.com/h2-2007-11-25.zip"><img border="1" src="images/download.png" alt="download" /></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2007-11-10.zip">All platforms (zip, 3.9 MB)</a>
+                <a href="http://www.h2database.com/h2-2007-11-25.zip">All platforms (zip, 3.9 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <a href="download.html">All Downloads</a>

h2/src/main/org/h2/engine/Constants.java

@@ -71,8 +71,8 @@ import org.h2.constant.SysProperties;
  */
 public class Constants {
 
-    public static final int BUILD_ID = 61;
-    private static final String BUILD = "2007-11-10";
+    public static final int BUILD_ID = 62;
+    private static final String BUILD = "2007-11-25";
     public static final int VERSION_MAJOR = 1;
     public static final int VERSION_MINOR = 0;
 

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -1269,12 +1269,11 @@ public class JdbcConnection extends TraceObject implements Connection {
     public NClob createNClob() throws SQLException {
         try {
             int id = getNextId(TraceObject.CLOB);
-            debugCodeAssign("NClob", TraceObject.CLOB, id);
-            debugCodeCall("createNClob");
+            debugCodeAssign("NClob", TraceObject.CLOB, id, "createNClob()");
             checkClosed();
             ValueLob v = ValueLob.createSmallLob(Value.CLOB, new byte[0]);
             return new JdbcClob(session, this, v, id);
-        } catch(Throwable e) {
+        } catch (Throwable e) {
             throw logAndConvert(e);
         }
     }
@@ -1388,7 +1387,7 @@ public class JdbcConnection extends TraceObject implements Connection {
      */
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
 */

h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java

@@ -2655,7 +2655,7 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
      */
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCodeCall("isWrapperFor");        
         throw Message.getUnsupportedException();
     }

h2/src/main/org/h2/jdbc/JdbcParameterMetaData.java

@@ -205,7 +205,7 @@ implements ParameterMetaData
      */
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCodeCall("isWrapperFor");
         throw Message.getUnsupportedException();
     }

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -3156,8 +3156,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
     public NClob getNClob(int columnIndex) throws SQLException {
         try {
             int id = getNextId(TraceObject.CLOB);
-            debugCodeAssign("NClob", TraceObject.CLOB, id);
-            debugCodeCall("getNClob", columnIndex);
+            debugCodeAssign("NClob", TraceObject.CLOB, id, "getNClob(" + columnIndex + ")");
             Value v = get(columnIndex);
             return v == ValueNull.INSTANCE ? null : new JdbcClob(session, conn, v, id);
         } catch (Throwable e) {
@@ -3179,8 +3178,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
     public NClob getNClob(String columnName) throws SQLException {
         try {
             int id = getNextId(TraceObject.CLOB);
-            debugCodeAssign("NClob", TraceObject.CLOB, id);
-            debugCodeCall("getNClob", columnName);
+            debugCodeAssign("NClob", TraceObject.CLOB, id, "getNClob(" + columnName + ")");
             Value v = get(columnName);
             return v == ValueNull.INSTANCE ? null : new JdbcClob(session, conn, v, id);
         } catch (Throwable e) {
@@ -3401,7 +3399,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
      */
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCode("isWrapperFor");
         throw Message.getUnsupportedException();
     }

h2/src/main/org/h2/jdbc/JdbcResultSetMetaData.java

@@ -441,7 +441,7 @@ public class JdbcResultSetMetaData extends TraceObject implements ResultSetMetaD
      */
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCodeCall("isWrapperFor");
         throw Message.getUnsupportedException();
     }

h2/src/main/org/h2/jdbc/JdbcStatement.java

@@ -867,7 +867,7 @@ public class JdbcStatement extends TraceObject implements Statement {
      */
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
 */

h2/src/main/org/h2/jdbcx/JdbcDataSource.java

@@ -288,7 +288,7 @@ implements XADataSource, DataSource, ConnectionPoolDataSource, Serializable, Ref
 
 //#ifdef JDK16
 /*
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
 */

h2/src/tools/org/h2/tools/i18n/PrepareTranslation.java

@@ -24,8 +24,8 @@ import org.h2.util.IOUtils;
 import org.h2.util.SortedProperties;
 import org.h2.util.StringUtils;
 
-import com.google.api.translate.Language;
-import com.google.api.translate.Translate;
+//import com.google.api.translate.Language;
+//import com.google.api.translate.Translate;
 
 public class PrepareTranslation {
     private static final String MAIN_LANGUAGE = "en";
@@ -55,7 +55,7 @@ public class PrepareTranslation {
 
         // create the translated documentation
         buildHtml("src/docsrc/text", "docs/html", "en");
-        buildHtml("src/docsrc/text", "docs/html", "de");
+        // buildHtml("src/docsrc/text", "docs/html", "de");
         buildHtml("src/docsrc/text", "docs/html", "ja");
 
         // convert the properties files back to utf8 text files, including the
@@ -424,7 +424,7 @@ public class PrepareTranslation {
                 if (t == null) {
                     System.out.println(trans.getName() + ": key " + key
                             + " not found in translation file; added dummy # 'translation'");
-                    t = "#" + now;
+                    t = "#" + autoTranslate(now, language);
                 }
                 p.put(key, t);
             } else {
@@ -473,17 +473,24 @@ public class PrepareTranslation {
     }
     
     private String autoTranslate(String original, String language) {
+        if (original == null || original.trim().length() == 0) {
+            return original;
+        }
         String translation = original;
         if (!AUTO_TRANSLATE) {
             return "#" + translation;
         }
-        if ("de".equals(language)) {
-            try {
-                return "#" + Translate.translate(original, Language.ENGLISH, Language.GERMAN);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+//        if ("de".equals(language)) {
+//            try {
+//                Thread.sleep(5000);
+//                translation = Translate.translate(original, Language.ENGLISH, Language.GERMAN);
+//                System.out.println("original: " + original);
+//                System.out.println("translation: " + translation);
+//            } catch (Throwable e) {
+//                System.out.println("Exception translating [" + original + "]: " + e);
+//                // e.printStackTrace();
+//            }
+//        }
         return "#" + translation;
     }
 }