Use src-jdbc41 for Maven build; fix warnings

Support byte array dumping in JDBC 4.1 PreparedStatement

.hgignore

@@ -0,0 +1,3 @@
+^bin$
+^.project$
+^.classpath$

README.md

@@ -0,0 +1,8 @@
+# log4jdbc
+A more extensive README will be created soon. For now, you can view the usage instructions at the old Google Code hosting site:
+
+https://code.google.com/p/log4jdbc/
+
+You can download the prebuilt jars at:
+
+https://code.google.com/p/log4jdbc/downloads/list

doc/CHANGES

@@ -1,3 +1,96 @@
+2015-09-30 1.3 release
+
+           o add new option, "log4jdbc.trim.sql.lines" which when set,
+             will trim SQL line by line (for beginning of line, only trimming
+             consistent white space) If this option is selected, the TrimSql
+             option will be ignored.
+
+           o remove JDBC 3 version (not all scripts updated yet.)
+
+           o getArray method improperly labeled as getURL (Issue 61.)
+
+           o bug fix ResultSetSpy.getStatement should return wrapped Statement,
+             not real Statement (Issue 55.)
+
+           o move to GitHub (Google Code shutting down.)
+
+2012-02-17 1.2 Release
+
+           o escape single quotes in PreparedStatement/CallableStatement bind variables (Issue 36.)
+
+           o process SQL consistently when the sql is dumped because an exception occurred.
+
+           o new SQL formatter to more reliably dump sql that can be run for MySql (Issue 34.)
+
+           o don't show debug info in sql timing dump unless debug is enabled on the logger
+             (to make the sql timing dump consistent with the way other the loggers work)
+
+           o add new option, log4jdbc.trim.sql.extrablanklines for removing
+             extra blank lines from sql output.
+
+           o fix issue where extra connection was being created when
+             ResultSet.getStatement was being called (Issue 33.)
+
+           o performance enhancement when logging not enabled (Issue 29.)
+
+2010-06-09 1.2 beta 2 Release
+
+           o add new option, log4jdbc.auto.load.popular.drivers for
+             disabling auto-loading of drivers
+
+           o look first for log4jdbc property settings in optional
+             log4jdbc.properties file in the classpath.
+
+           o Fix non-threadsafe usage of SimpleDateFormat (Issue 18)
+
+           o add new option, log4jdbc.trim.sql to trim the SQL before logging
+             it.
+
+           o add new option, log4jdbc.suppress.generated.keys.exception that
+             will ignore any exception produced by the method,
+             Statement.getGeneratedKeys().  This flag is useful in Coldfusion
+             environments which typically call this method after every update,
+             even if unwarranted, and ignoring the exception, thus clogging up
+             the logs with these exception reports.
+
+           o add support for the newer oracle.jdbc.OracleDriver driver (the
+             older oracle.jdbc.driver.OracleDriver driver is still supported
+             as well) and add corrected date formatting for Oracle.
+
+           o fix possible null pointer issue with setBlob and setClob (Issue 21)
+
+2010-03-20 1.2 beta 1 Release
+
+           o Check for exception that should not, but in some cases could
+             occur when trying to format parameter arguments.
+
+           o Use only one type of date format so that time portion of Date
+             types is not dropped!
+
+           o use to_date function for Oracle (Issue 14)
+
+           o performance improvements
+
+           o fix: respect DumpSqlMaxLineLength option.
+
+           o various other fixes (including Issues 8 and 9)
+
+2009-02-26 1.2 alpha 2 Release
+
+           o (Issue 1) fix bug where batch of logged SQL wasn't cleared
+             properly when using batched SQL.
+
+           o Added log4jdbc.statement.warn system property; defaults to false.
+
+             This is a new option to control the SQL Statement warnings in the
+             log.  When Statement objects are used by the application, the SQL
+             in the log is preceded by "{WARNING: Statement used to run SQL}"
+             This was always on in previous releases.  Now it
+             is off by default, and can be turned on by setting this property.
+
+           o (Issue 2) add getter methods across the board for the real
+             wrapped object.
+
 2008-11-08 1.2 alpha 1 Release
 
            o added a new logger "jdbc.connection" to dump connection open and
@@ -27,8 +120,8 @@
            o dump a null bind variable as NULL instead of <null> for more
              accurate and reuseable SQL output.
 
-           o several new options for controlling what types of SQL statements are 
+           o several new options for controlling what types of SQL statements
-             logged:
+             are logged:
 
              log4jdbc.dump.sql.select   default value is true
              log4jdbc.dump.sql.insert   default value is true

doc/LICENSE

@@ -1,6 +1,6 @@
 log4jdbc is open source software, released under the Apache License, Version 2.0:
 
-Copyright 2007-2008 Arthur Blake
+Copyright 2007-2011 Arthur Blake
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use log4jdbc except in compliance with the License.

doc/README

@@ -1,5 +1,3 @@
 [this software is open source, released under the Apache License, Version 2.0:  see LICENSE file]
 
-Please see the main log4jdbc web page at http://log4jdbc.sourceforge.net for detailed features and usage information.
+Please see the main log4jdbc web page at http://log4jdbc.googlecode.com for detailed features and usage information.
-There should also be in this folder, a copy of the main web page as it existed when this release was made.
-See index.html.

doc/TODO

@@ -18,3 +18,5 @@ o  review dumpedSql method - make auto line breaking option (& num chars used) b
 o  need log4jdbc.debug.stack.regex so that the stack matching can take place via regex
 
 o  maven2 repository support
+
+o  this may be a better solution to SimpleDateFormat contention issue:  http://www.javaspecialists.eu/archive/Issue172.html

doc/log4jdbc.css

@@ -1,35 +0,0 @@
-/*
- red in logo is  #f06
- purple in logo is  #ef39e9
-*/
-
-.left {text-align:left;}
-.right{text-align:right;}
-.usage {text-align:left;}
-h1 {font-size:1em;color:#f06;background-color:#eee;display:block;padding:0.8em;}
-h2 {font-size:1.2em;color:#f06;background-color:#eee;display:block;height:2em;padding-top:0.8em;}
-h3 {font-size:1.1em;color:0;font-weight:bold;margin:5px;}
-a {text-decoration:none;}
-a:link {color: #f06;}
-a:visited {color: #f06;}
-p {padding:10px;}
-span.file {font-weight:bold;}
-ul {padding:10px;list-style:square}
-ol {padding:10px;list-style:decimal;}
-
-ul li {margin-left:2em;padding:0.3em;}
-ol li {margin-left:2em;padding:0.3em;}
-
-li p {margin-left:0;}
-
-code,pre {color:navy;background-color:beige;font-size:11pt;}
-
-pre {border:2px dashed navy;margin-left:3em;margin-right:4em;margin-top:1em;margin-bottom:1em;white-space:pre-line;}
-
-.copyright {font-size:0.8m;text-align:center}
-.copyright a {color:#ef39e9}
-.sflogo {float:right; margin-right:30px;}
-
-table.options {margin-left:40px;margin-right:20px;border:1px solid black;border-collapse:collapse;}
-table.options thead th {text-align:center;border:1px solid black; padding:5px}
-table.options tbody td {text-align:left;border:1px solid black; padding:5px}

pom.xml

@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.googlecode.log4jdbc</groupId>
+  <artifactId>log4jdbc</artifactId>
+  <version>1.3-SNAPSHOT</version>
+  <name>log4jdbc</name>
+  <description>log4jdbc is a Java JDBC driver that can log SQL and/or JDBC calls (and optionally SQL timing information) for other JDBC drivers using the Simple Logging Facade For Java (SLF4J) logging system.</description>
+  <url>https://github.com/arthurblake/log4jdbc</url>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+      <comments>A business-friendly OSS license</comments>
+    </license>
+  </licenses>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.0</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>src-jdbc41</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

scripts/README.txt

@@ -1,4 +1,8 @@
-To build log4jdbc, you must have Ant 1.6.5 or later installed,
+log4jdbc is built with Ant 1.8.x and JDK 1.6.x
-and JDK 1.4 and JDK 1.6 installed.
 
-The build.cmd file is useful for building both the jdbc 3 version (JDK 1.4) and the jdbc 4 version (under JDK 1.6) under windows.
+The build.cmd file is useful for building both the jdbc 3 version (JDK 1.4) and
+the jdbc 4 version (under JDK 1.6) under windows.  The javadoc.cmd file is
+useful for building javadoc (requires the 3rd party ydoc tool)
+
+NOTE: as of 2015-09-30 the jdbc 3 version has been removed - not all build
+scripts may have been updated to reflect that.

scripts/build.cmd

@@ -1,18 +1,12 @@
 @echo off
 setlocal
 
-rem this is a bit convoluted because two jdk's must be invoked...
+REM (JDBC 3 version removed as of 2015-09-30)
+REM invoke the 1.6 jvm for the JDBC 4 version
 
-set ANT_HOME=c:\apache-ant-1.6.5
+set ANT_HOME=c:\apache-ant-1.8.1
-
+set JAVA_HOME=C:\jdk\1.6.0_21
-set JAVA_HOME=C:\j2sdk1.4.2_13
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
+
 call java -version
-
+call ant -Djdbc.level=4 -Djvm.ver=1.6 all
-call ant -Djdbc.level=3 all
-
-set JAVA_HOME=C:\jdk1.6.0_10
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
-call java -version
-
-call ant -Djdbc.level=4 all

scripts/build.xml

@@ -9,7 +9,7 @@
   built with jdk 1.4.2_13 (for use with jdbc3)
   and/or jdk 1.6.0 (for use with jdbc4)
 
-  Copyright 2007-2008 Arthur Blake
+  Copyright 2007-2015 Arthur Blake
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 
   <!-- the jdbc.level flag should be set externally to either 3 or 4
 
-       this is the jdbc version and should be 3 if using a jdk 1.4 or 1.5 (jdk 1.4 is recommended for maximum compatibility)
+       this is the jdbc version and should be 3 if using a jdk 1.4 or 1.5
 
        the jdbc.level flag should be set to 4 if using a jdk 1.6 or greater.
 
@@ -40,6 +40,7 @@
   -->
 
   <property name="jdbc.level" value="3" />
+  <property name="jvm.ver" value="1.4" />
   <property name="jdbc.prefix" value="jdbc${jdbc.level}" />
 
   <property name="src" value="src-${jdbc.prefix}" />
@@ -48,7 +49,7 @@
 
 
   <!-- release version -->
-  <property name="version" value="1.2alpha1"/>
+  <property name="version" value="1.3"/>
 
   <target name="all" depends="cleancompile,compile,cleanjar,jar"/>
 
@@ -68,7 +69,8 @@
   <property name="ydoc.home.4" value="/ydoc-2.2_04-jdk1.5"/>
 
   <target name="compile" description="compile all the source code">
-    <javac srcdir="${src}" destdir="${classes}" deprecation="true" debug="true">
+    <javac source="${jvm.ver}" target="${jvm.ver}" srcdir="${src}" destdir="${classes}"
+      deprecation="true" debug="true" includeAntRuntime="false">
       <classpath>
         <pathelement location="$src"/>
         <fileset dir="lib">
@@ -93,26 +95,21 @@
   </target>
 
 
-  <target name="cleanjavadoc">
+  <target name="cleanjavadoc" description="clean javadoc">
     <delete dir="${apidocs}" />
     <mkdir dir="${apidocs}" />
   </target>
 
-  <target name="cleanrelease">
+  <target name="cleanrelease" description="clean up any release files">
     <delete file="../log4jdbc-${version}.zip"/>
-    <delete file="../log4jdbc-${version}.tar"/>
-    <delete file="../log4jdbc-${version}.tar.gz"/>
   </target>
 
+  <target name="clean" depends="cleanrelease,cleanjavadoc,cleanjar,cleancompile" description="clean up all build artifacts"/>
+
   <target name="release" depends="cleanrelease" description="make a complete release distribution (a .jar zip and tar.gz file for release)">
     <zip destfile="../log4jdbc-${version}.zip">
       <zipfileset dir="." prefix="log4jdbc-${version}" excludes="*.zip,*.tar.gz,*,iml,*.ipr,*.iws,thirdparty-stuff/**,classes*/**"/>
     </zip>
-    <tar destfile="../log4jdbc-${version}.tar">
-      <tarfileset dir="." prefix="log4jdbc-${version}" excludes="*.zip,*.tar.gz,*,iml,*.ipr,*.iws,thirdparty-stuff/**,classes*/**"/>
-    </tar>
-    <gzip destfile="../log4jdbc-${version}.tar.gz" src="../log4jdbc-${version}.tar"/>
-    <delete file="../log4jdbc-${version}.tar"/>
   </target>
 
   <!-- make the javadoc (or ydoc which includes UML diagrams) -->
@@ -162,7 +159,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="/j2sdk1.4.2_13/src"/>
+      <sourcepath path="/jdk/1.4.2_19/src"/>
       <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
 <!--
       <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>
@@ -209,11 +206,8 @@
       <!-- 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_10/src"/>
+      <sourcepath path="/jdk/1.6.0_21/src"/>
       <link href="http://java.sun.com/javase/6/docs/api/"/>
-<!--
-      <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>
--->
       <link href="http://www.slf4j.org/api/"/>
 
       <!-- ydoc doclet for UML diagrams, see http://www.yworks.com/en/products_ydoc.htm -->

scripts/javadoc.cmd

@@ -1,20 +1,14 @@
 @echo off
 setlocal
 
-rem run ydoc for jdbc 3 with jdk 1.4 and
+REM (JDBC 3 version removed as of 2015-09-30)
-rem run ydoc for jdbc 4 with jdk 1.6
+REM invoke the 1.6 jvm for the JDBC 4 version
 
-set ANT_HOME=c:\apache-ant-1.6.5
+set ANT_HOME=c:\apache-ant-1.8.1
 set ANT_OPTS=-Xmx512m
 
-set JAVA_HOME=C:\j2sdk1.4.2_13
+set JAVA_HOME=c:\jdk\1.6.0_21
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
+
 call java -version
-
+call ant -Djdbc.level=4 -Djvm.ver=1.6 ydoc.4
-call ant -Djdbc.level=3 ydoc.3
-
-set JAVA_HOME=c:\jdk1.6.0_10
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin
-call java -version
-
-call ant -Djdbc.level=4 ydoc.4

scripts/profsql.cmd

@@ -2,7 +2,7 @@
 
 rem *************************************************************************************************
 rem *                                                                                               *
-rem *  Copyright 2007-2008 Arthur Blake                                                             *
+rem *  Copyright 2007-2015 Arthur Blake                                                             *
 rem *                                                                                               *
 rem *  Licensed under the Apache License, Version 2.0 (the "License");                              *
 rem *  you may not use this file except in compliance with the License.                             *
@@ -25,4 +25,4 @@ rem *  profiling output report.
 rem *                                                                                               *
 rem *************************************************************************************************
 
-java -Xmx1024m -classpath ..\build\log4jdbc3-1.2alpha1.jar net.sf.log4jdbc.PostLogProfilerProcessor %*
+java -Xmx1024m -classpath ..\build\log4jdbc3-1.2.jar net.sf.log4jdbc.PostLogProfilerProcessor %*

scripts/profsql.sh

@@ -2,7 +2,7 @@
 
 # *************************************************************************************************
 # *                                                                                               *
-# *  Copyright 2007-2008 Arthur Blake                                                             *
+# *  Copyright 2007-2015 Arthur Blake                                                             *
 # *                                                                                               *
 # *  Licensed under the Apache License, Version 2.0 (the "License");                              *
 # *  you may not use this file except in compliance with the License.                             *
@@ -25,4 +25,4 @@
 # *                                                                                               *
 # *************************************************************************************************
 
-java -Xmx1024m -classpath ../build/log4jdbc3-1.2alpha1.jar net.sf.log4jdbc.PostLogProfilerProcessor $@
+java -Xmx1024m -classpath ../build/log4jdbc3-1.2.jar net.sf.log4jdbc.PostLogProfilerProcessor $@