update 1.6 JDK, increase amount of memory for 1.6 javadoc, and fix ou…

…tdated javadoc
hohonuuli · Nov 8, 2008 · 48cb541 · 48cb541
1 parent 201d3b9
commit 48cb541
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/scripts/build.cmd b/scripts/build.cmd
@@ -11,7 11,7 @@ call java -version
 
 call ant -Djdbc.level=3 all
 
-set JAVA_HOME=C:\jdk1.6.0_05
 set JAVA_HOME=C:\jdk1.6.0_10
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
 call java -version
 

diff --git a/scripts/build.xml b/scripts/build.xml
@@ -194,6 194,7 @@
  <property name="ps" value="${path.separator}"/>
 
  <javadoc destdir="${apidocs}" packagenames="net.sf.log4jdbc.*"
  maxmemory="512m"
  Windowtitle="log4${jdbc.prefix} ${version}"
  Header="&lt;b&gt;&lt;a href=&quot;http://log4jdbc.sourceforge.net&quot;&gt;log4${jdbc.prefix} ${version}&lt;/a&gt;&lt;/b&gt;"
  Use="true" breakiterator="true">
@@ -208,7 209,7 @@
  <!-- note that the jdk source code is referenced here so that javadoc will be generated from
  interface class methods when none is specified in the implementation -->
 
- <sourcepath path="/jdk1.6.0_03/src"/>
  <sourcepath path="/jdk1.6.0_10/src"/>
  <link href="http://java.sun.com/javase/6/docs/api/"/>
 <!--
  <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>

diff --git a/scripts/javadoc.cmd b/scripts/javadoc.cmd
@@ -5,14 5,15 @@ rem run ydoc for jdbc 3 with jdk 1.4 and
 rem run ydoc for jdbc 4 with jdk 1.6
 
 set ANT_HOME=c:\apache-ant-1.6.5
 set ANT_OPTS=-Xmx512m
 
 set JAVA_HOME=C:\j2sdk1.4.2_13
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
 call java -version
 
 call ant -Djdbc.level=3 ydoc.3
 
-set JAVA_HOME=c:\jdk1.6.0_03
 set JAVA_HOME=c:\jdk1.6.0_10
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
 call java -version
 

diff --git a/src-jdbc3/net/sf/log4jdbc/DriverSpy.java b/src-jdbc3/net/sf/log4jdbc/DriverSpy.java
@@ -45,10 45,13 @@
  * <li>com.sybase.jdbc2.jdbc.SybDriver</li>
  * <li>net.sourceforge.jtds.jdbc.Driver</li>
  * <li>com.microsoft.jdbc.sqlserver.SQLServerDriver</li>
  * <li>com.microsoft.sqlserver.jdbc.SQLServerDriver</li>
  * <li>weblogic.jdbc.sqlserver.SQLServerDriver</li>
  * <li>com.informix.jdbc.IfxDriver</li>
  * <li>org.apache.derby.jdbc.ClientDriver</li>
  * <li>org.apache.derby.jdbc.EmbeddedDriver</li>
  * <li>com.mysql.jdbc.Driver</li>
  * <li>org.postgresql.Driver</li>
  * <li>org.hsqldb.jdbcDriver</li>
  * <li>org.h2.Driver</li>
  * </ul>
@@ -274,15 277,18 @@ private static String getStringOption(String propName)
  *
  * @param propName property name to get.
  * @param defaultValue default value to use if undefined.
- * @return
  * 
  * @return boolean value found in property, or defaultValue if no property
  * found.
  */
  private static boolean getBooleanOption(String propName, boolean defaultValue)
  {
  String propValue = System.getProperty(propName);
  boolean val;
  if (propValue == null)
  {
- log.debug("x " propName " is not defined (using default value " defaultValue ")");
  log.debug("x " propName " is not defined (using default value " 
  defaultValue ")");
  return defaultValue;
  }
  else

diff --git a/src-jdbc4/net/sf/log4jdbc/DriverSpy.java b/src-jdbc4/net/sf/log4jdbc/DriverSpy.java
@@ -45,10 45,13 @@
  * <li>com.sybase.jdbc2.jdbc.SybDriver</li>
  * <li>net.sourceforge.jtds.jdbc.Driver</li>
  * <li>com.microsoft.jdbc.sqlserver.SQLServerDriver</li>
  * <li>com.microsoft.sqlserver.jdbc.SQLServerDriver</li>
  * <li>weblogic.jdbc.sqlserver.SQLServerDriver</li>
  * <li>com.informix.jdbc.IfxDriver</li>
  * <li>org.apache.derby.jdbc.ClientDriver</li>
  * <li>org.apache.derby.jdbc.EmbeddedDriver</li>
  * <li>com.mysql.jdbc.Driver</li>
  * <li>org.postgresql.Driver</li>
  * <li>org.hsqldb.jdbcDriver</li>
  * <li>org.h2.Driver</li>
  * </ul>
@@ -274,15 277,18 @@ private static String getStringOption(String propName)
  *
  * @param propName property name to get.
  * @param defaultValue default value to use if undefined.
- * @return
  * 
  * @return boolean value found in property, or defaultValue if no property
  * found.
  */
  private static boolean getBooleanOption(String propName, boolean defaultValue)
  {
  String propValue = System.getProperty(propName);
  boolean val;
  if (propValue == null)
  {
- log.debug("x " propName " is not defined (using default value " defaultValue ")");
  log.debug("x " propName " is not defined (using default value "
  defaultValue ")");
  return defaultValue;
  }
  else